mysql/mysql.patch

Fri, 07 Sep 2012 19:08:07 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 07 Sep 2012 19:08:07 +0200
changeset 667
9dacbd1d1aa2
parent 527
7b145ccff1e9
permissions
-rw-r--r--

Correct build configuration in Solaris subdir, correct english grammar,
remove irrelevant strip notice, introduce custom CFLAG logic, facilitate
use of Solaris Studio compiler with needed build configuration
adjustments, conditionally build 64 bit position independent code,
and accommodate tun(7) in newer Solaris releases by renaming driver
and module from conflicting 'tun' to 'vtun'. These changes include
some nonstandard 'I give up' logic causing out of tree builds by
manipulating the PATH, for example.

michael@527 1 Index: mysys/default.c
michael@528 2 --- mysys/default.c.orig 2012-08-22 19:47:54.486251769 +0200
michael@528 3 +++ mysys/default.c 2012-08-22 19:48:07.379075804 +0200
michael@528 4 @@ -1222,8 +1222,7 @@
michael@527 5
michael@527 6 #else
michael@527 7
michael@527 8 - errors += add_directory(alloc, "/etc/", dirs);
michael@527 9 - errors += add_directory(alloc, "/etc/mysql/", dirs);
michael@527 10 + errors += add_directory(alloc, "@l_prefix@/etc/mysql/", dirs);
michael@527 11
michael@527 12 #if defined(DEFAULT_SYSCONFDIR)
michael@527 13 if (DEFAULT_SYSCONFDIR[0])
michael@527 14 Index: scripts/mysql_system_tables_data.sql
michael@528 15 --- scripts/mysql_system_tables_data.sql.orig 2012-08-22 19:49:42.514877593 +0200
michael@528 16 +++ scripts/mysql_system_tables_data.sql 2012-08-22 19:49:52.671510387 +0200
michael@528 17 @@ -26,8 +26,6 @@
michael@527 18 -- Fill "db" table with default grants for anyone to
michael@527 19 -- access database 'test' and 'test_%' if "db" table didn't exist
michael@527 20 CREATE TEMPORARY TABLE tmp_db LIKE db;
michael@527 21 -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 22 -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 23 INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
michael@527 24 DROP TABLE tmp_db;
michael@527 25

mercurial