- updated for 5.1.23rc

Changed files:
    mysql-client-config.patch -> 1.4
    mysql-libs.patch -> 1.19
    mysql-system-users.patch -> 1.3
    mysql-upgrade.patch -> 1.7

diff --git a/mysql-client-config.patch b/mysql-client-config.patch
index 662ffa13454e30fc4657c7dd88e825398ced2f69..5f56e98e738d4c218a57876f98c88f180d3a160c 100644 (file)
--- a/mysql-client-config.patch
+++ b/mysql-client-config.patch
@@ -1,23 +1,3 @@
---- mysql-5.1.6-alpha/libmysqld/client.c~      2006-02-21 16:09:31.000000000 +0200
-+++ mysql-5.1.6-alpha/libmysqld/client.c       2006-02-21 16:11:30.000000000 +0200
-@@ -1456,6 +1456,7 @@
- 
-   mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
-   mysql->options.report_data_truncation= TRUE;  /* default */
-+  mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL);
- 
-   /*
-     By default we don't reconnect because it could silently corrupt data (after
---- mysql-5.1.6-alpha/sql/client.c~    2006-02-21 16:09:32.000000000 +0200
-+++ mysql-5.1.6-alpha/sql/client.c     2006-02-21 16:12:13.000000000 +0200
-@@ -1456,6 +1456,7 @@
- 
-   mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
-   mysql->options.report_data_truncation= TRUE;  /* default */
-+  mysql_read_default_options(&mysql->options, "/etc/mysql/mysql-client.conf", NULL);
- 
-   /*
-     By default we don't reconnect because it could silently corrupt data (after
 --- mysql-5.1.6-alpha/sql-common/client.c~     2006-02-21 16:09:34.000000000 +0200
 +++ mysql-5.1.6-alpha/sql-common/client.c      2006-02-21 16:14:10.000000000 +0200
 @@ -1456,6 +1456,7 @@

diff --git a/mysql-libs.patch b/mysql-libs.patch
index 9c47009c83c29c0556ef5462312b61a35c04f740..554835ad8cffffab43aac603a97b5b350581e63b 100644 (file)
--- a/mysql-libs.patch
+++ b/mysql-libs.patch
@@ -1,6 +1,6 @@
 --- mysql-5.1.21-beta/configure.in~    2007-08-29 19:00:29.000000000 +0300
 +++ mysql-5.1.21-beta/configure.in     2007-08-29 19:00:35.000000000 +0300
-@@ -754,9 +754,9 @@
+@@ -787,9 +787,9 @@
  
  AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
  
@@ -9,11 +9,11 @@
 -AC_CHECK_FUNC(gethostbyname_r)
 +AC_CHECK_FUNC(gethostbyname_r, [],
 +  [AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
-+     [AC_CHECK_LIB(nsl, gethostbyname_r)])])
- AC_CHECK_LIB(mtmalloc, malloc)
++    [AC_CHECK_LIB(nsl, gethostbyname_r)])])
  
  AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
-@@ -766,7 +766,11 @@
+ AC_CHECK_FUNC(yp_get_default_domain, ,
+@@ -798,7 +798,11 @@
  # This may get things to compile even if bind-8 is installed
  AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
  # Check if crypt() exists in libc or libcrypt, sets LIBS if needed
@@ -28,15 +28,15 @@
  AC_CHECK_FUNC(sched_yield, , AC_CHECK_LIB(posix4, sched_yield))
 --- mysql-5.0.21/libmysql_r/Makefile.am~       2006-05-02 16:55:15.179229923 +0300
 +++ mysql-5.0.21/libmysql_r/Makefile.am        2006-05-02 16:56:08.080408785 +0300
-@@ -32,7 +32,7 @@
- libmysql_dir = $(top_srcdir)/libmysql
+@@ -30,7 +30,7 @@
+ include $(top_srcdir)/libmysql/Makefile.shared
  
- libmysqlclient_r_la_SOURCES = $(target_sources)
+ nodist_libmysqlclient_r_la_SOURCES = $(target_sources)
 -libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las)
 +libmysqlclient_r_la_LIBADD = $(target_libadd) $(yassl_las) -lpthread
  libmysqlclient_r_la_LDFLAGS = $(target_ldflags)
  
- # This is called from the toplevel makefile
+ link_sources:
 --- mysql-5.1.21-beta/sql/Makefile.am~ 2007-08-29 18:58:33.000000000 +0300
 +++ mysql-5.1.21-beta/sql/Makefile.am  2007-08-29 19:01:33.000000000 +0300
 @@ -43,7 +43,7 @@

diff --git a/mysql-system-users.patch b/mysql-system-users.patch
index a927b88f92d07c64ebc5e1b69312019ff607a8d1..f1e0864fb340f0a7d94c08d50325606f9358fd15 100644 (file)
--- a/mysql-system-users.patch
+++ b/mysql-system-users.patch
@@ -1,10 +1,11 @@
 diff -ur mysql-5.1.22-rc.org/scripts/mysql_system_tables_data.sql mysql-5.1.22-rc/scripts/mysql_system_tables_data.sql
 --- mysql-5.1.22-rc.org/scripts/mysql_system_tables_data.sql   2007-09-24 12:29:43.000000000 +0200
 +++ mysql-5.1.22-rc/scripts/mysql_system_tables_data.sql       2007-11-24 20:22:08.360937978 +0100
-@@ -2,20 +2,14 @@
- -- The inital data for system tables of MySQL Server
- --
+@@ -7,23 +7,16 @@
+ -- containing "@current_hostname" are filtered out by mysql_install_db.
+ set @current_hostname= @@hostname;
  
+-
 --- Fill "db" table with default grants for anyone to
 --- access database 'test' and 'test_%' if "db" table didn't exist
 -CREATE TEMPORARY TABLE tmp_db LIKE db;
@@ -14,18 +15,20 @@ diff -ur mysql-5.1.22-rc.org/scripts/mysql_system_tables_data.sql mysql-5.1.22-r
 -DROP TABLE tmp_db;
 -
 -
---- Fill "users" table with default users allowing root access
-+-- Fill "users" table with default users allowing mysql access
+ -- Fill "users" table with default users allowing root access
  -- from local machine if "users" table didn't exist before
  CREATE TEMPORARY TABLE tmp_user LIKE user;
+ set @current_hostname= @@hostname;
 -INSERT INTO tmp_user VALUES ('localhost','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
--REPLACE INTO tmp_user VALUES (@@hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
+-REPLACE INTO tmp_user VALUES (@current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
 -REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
 +INSERT INTO tmp_user VALUES ('localhost','mysql','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
-+REPLACE INTO tmp_user VALUES (@@hostname,'mysql','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
++REPLACE INTO tmp_user VALUES (@current_hostname,'mysql','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
 +REPLACE INTO tmp_user VALUES ('127.0.0.1','mysql','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
 +INSERT INTO tmp_user VALUES ('localhost','mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);
-+REPLACE INTO tmp_user VALUES (@@hostname,'mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);
++REPLACE INTO tmp_user VALUES (@current_hostname,'mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);
 +REPLACE INTO tmp_user VALUES ('127.0.0.1','mysql_sysadmin','','N','N','N','N','N','N','Y','Y','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','N','','','','',0,0,0,0);
+ INSERT INTO tmp_user (host,user) VALUES ('localhost','');
+ INSERT INTO tmp_user (host,user) VALUES (@current_hostname,'');
  INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
- DROP TABLE tmp_user;
+

diff --git a/mysql-upgrade.patch b/mysql-upgrade.patch
index 1d72d8e0a6d69c4cadad2af524b1894e572dbeed..86741cd57b12cc3d3f0e54526ac0575c6280bb37 100644 (file)
--- a/mysql-upgrade.patch
+++ b/mysql-upgrade.patch
@@ -16,98 +16,6 @@
  
  static DYNAMIC_STRING ds_args;
  
-@@ -349,91 +349,6 @@
-   DBUG_RETURN(ret);
- }
- 
--
--/*
--  Look for the tool in the same directory as mysql_upgrade.
--
--  When running in a not yet installed build the the program
--  will exist but it need to be invoked via it's libtool wrapper.
--  Check if the found tool can executed and if not look in the
--  directory one step higher up where the libtool wrapper normally
--  is found
--*/
--
--static void find_tool(char *tool_path, const char *tool_name)
--{
--  char path[FN_REFLEN];
--  DYNAMIC_STRING ds_tmp;
--  DBUG_ENTER("find_tool");
--  DBUG_PRINT("enter", ("progname: %s", my_progname));
--
--  if (init_dynamic_string(&ds_tmp, "", 32, 32))
--    die("Out of memory");
--
--  /* Initialize path with the full path to this program */
--  if (get_full_path_to_executable(path))
--  {
--    /*
--      Easy way to get full executable path failed, try
--      other methods
--    */
--    if (my_progname[0] == FN_LIBCHAR)
--    {
--      /* 1. my_progname contains full path */
--      strmake(path, my_progname, FN_REFLEN);
--    }
--    else if (my_progname[0] == '.')
--    {
--      /* 2. my_progname contains relative path, prepend wd */
--      char buf[FN_REFLEN];
--      my_getwd(buf, FN_REFLEN, MYF(0));
--      my_snprintf(path, FN_REFLEN, "%s%s", buf, my_progname);
--    }
--    else
--    {
--      /* 3. Just go for it and hope tool is in path */
--      path[0]= 0;
--    }
--  }
--  do
--  {
--    size_t path_len;
--    DBUG_PRINT("enter", ("path: %s", path));
--
--    /* Chop off last char(since it might be a /) */
--    path[max((strlen(path)-1), 0)]= 0;
--
--    /* Chop off last dir part */
--    dirname_part(path, path, &path_len);
--
--    /* Format name of the tool to search for */
--    fn_format(tool_path, tool_name,
--              path, "", MYF(MY_REPLACE_DIR));
--
--    verbose("Looking for '%s' in: %s", tool_name, tool_path);
--
--    /* Make sure the tool exists */
--    if (my_access(tool_path, F_OK) != 0)
--      die("Can't find '%s'", tool_path);
--
--    /*
--      Make sure it can be executed, otherwise try again
--      in higher level directory
--    */
--  }
--  while(run_tool(tool_path,
--                 &ds_tmp, /* Get output from command, discard*/
--                 "--help",
--                 "2>&1",
--                 IF_WIN("> NUL", "> /dev/null"),
--                 NULL));
--
--  dynstr_free(&ds_tmp);
--
--  DBUG_VOID_RETURN;
--}
--
--
- /*
-   Run query using "mysql"
- */
 @@ -758,12 +673,6 @@
    dynstr_append_os_quoted(&ds_args, "--user=", opt_user, NullS);
    dynstr_append(&ds_args, " ");