michael@527: Index: mysys/default.c michael@528: --- mysys/default.c.orig 2012-08-22 19:47:54.486251769 +0200 michael@528: +++ mysys/default.c 2012-08-22 19:48:07.379075804 +0200 michael@528: @@ -1222,8 +1222,7 @@ michael@527: michael@527: #else michael@527: michael@527: - errors += add_directory(alloc, "/etc/", dirs); michael@527: - errors += add_directory(alloc, "/etc/mysql/", dirs); michael@527: + errors += add_directory(alloc, "@l_prefix@/etc/mysql/", dirs); michael@527: michael@527: #if defined(DEFAULT_SYSCONFDIR) michael@527: if (DEFAULT_SYSCONFDIR[0]) michael@527: Index: scripts/mysql_system_tables_data.sql michael@528: --- scripts/mysql_system_tables_data.sql.orig 2012-08-22 19:49:42.514877593 +0200 michael@528: +++ scripts/mysql_system_tables_data.sql 2012-08-22 19:49:52.671510387 +0200 michael@528: @@ -26,8 +26,6 @@ michael@527: -- Fill "db" table with default grants for anyone to michael@527: -- access database 'test' and 'test_%' if "db" table didn't exist michael@527: CREATE TEMPORARY TABLE tmp_db LIKE db; michael@527: -INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); michael@527: -INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); michael@527: INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0; michael@527: DROP TABLE tmp_db; michael@527: