mysql.patch 1.8 KB

12345678910111213141516171819202122232425262728293031323334353637383940
  1. Index: mysys/default.c
  2. --- mysys/default.c.orig 2007-05-02 16:40:31 +0200
  3. +++ mysys/default.c 2007-05-10 07:54:13 +0200
  4. @@ -1006,7 +1006,7 @@
  5. if ((env= getenv("ETC")))
  6. *ptr++= env;
  7. #endif
  8. - *ptr++= "/etc/";
  9. + *ptr++= "@l_prefix@/etc/mysql/";
  10. #endif
  11. if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
  12. *ptr++= env;
  13. Index: scripts/mysql_config.sh
  14. --- scripts/mysql_config.sh.orig 2007-05-02 16:40:15 +0200
  15. +++ scripts/mysql_config.sh 2007-05-10 07:54:13 +0200
  16. @@ -97,9 +97,9 @@
  17. # Create options
  18. # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
  19. -libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
  20. +libs=" $ldflags -L$pkglibdir -lmysqlclient -lmysys @ZLIB_DEPS@ @NON_THREADED_LIBS@"
  21. libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
  22. -libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
  23. +libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r -lmysys @ZLIB_DEPS@ @LIBS@ @openssl_libs@ "
  24. embedded_libs=" $ldflags -L$pkglibdir -lmysqld @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @innodb_system_libs@ @openssl_libs@ "
  25. cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
  26. Index: scripts/mysql_system_tables_data.sql
  27. --- scripts/mysql_system_tables_data.sql.orig 2007-05-02 16:40:01 +0200
  28. +++ scripts/mysql_system_tables_data.sql 2007-05-10 07:55:32 +0200
  29. @@ -5,8 +5,6 @@
  30. -- Fill "db" table with default grants for anyone to
  31. -- access database 'test' and 'test_%' if "db" table didn't exist
  32. CREATE TEMPORARY TABLE tmp_db LIKE db;
  33. -INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
  34. -INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
  35. INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
  36. DROP TABLE tmp_db;