Merge lp:~percona-dev/percona-server/release-5.1.50-12-fix-diff-syntax into lp:percona-server/release-5.1.50-12

[Oleg Tsarev]

[Vadim Tkachenko (vadim-tk)]

review: Approve

=== modified file 'bug580324.patch'
--- bug580324.patch	2010-09-14 16:34:51 +0000
+++ bug580324.patch	2010-10-19 00:19:43 +0000
@@ -5,7 +5,7 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -Nur a/sql/sql_base.cc b/sql/sql_base.cc
+diff -ruN a/sql/sql_base.cc b/sql/sql_base.cc
 --- a/sql/sql_base.cc	2010-05-27 19:54:18.000000000 +0400
 +++ b/sql/sql_base.cc	2010-05-27 19:55:20.000000000 +0400
 @@ -233,8 +233,12 @@
@@ -23,7 +23,7 @@
    if (tmp_table)
    {
      int4store(key + key_length, thd->server_id);
-diff -Nur a/sql/sql_parse.cc b/sql/sql_parse.cc
+diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
 --- a/sql/sql_parse.cc	2010-05-27 19:54:18.000000000 +0400
 +++ b/sql/sql_parse.cc	2010-05-27 20:03:20.000000000 +0400
 @@ -1326,10 +1326,12 @@
@@ -89,7 +89,7 @@
      thd->set_query(fields, query_length);
      general_log_print(thd, command, "%s %s", table_list.table_name, fields);
      if (lower_case_table_names)
-diff -Nur a/strings/ctype-utf8.c b/strings/ctype-utf8.c
+diff -ruN a/strings/ctype-utf8.c b/strings/ctype-utf8.c
 --- a/strings/ctype-utf8.c	2010-05-06 19:28:05.000000000 +0400
 +++ b/strings/ctype-utf8.c	2010-05-27 20:04:20.000000000 +0400
 @@ -4116,6 +4116,10 @@

=== modified file 'bugfix48929.patch'
--- bugfix48929.patch	2010-09-14 16:34:51 +0000
+++ bugfix48929.patch	2010-10-19 00:19:43 +0000
@@ -5,7 +5,7 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -Nur a/configure.in b/configure.in
+diff -ruN a/configure.in b/configure.in
 --- a/configure.in	2010-07-07 03:33:05.008972002 +0400
 +++ b/configure.in	2010-07-07 03:33:05.788972002 +0400
 @@ -808,7 +808,7 @@
@@ -17,7 +17,7 @@
   stdlib.h stddef.h \
   strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \
   sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
-diff -Nur a/configure b/configure
+diff -ruN a/configure b/configure
 --- a/configure	2010-07-26 18:29:12.172114128 +0900
 +++ b/configure	2010-07-26 20:44:59.199030524 +0900
 @@ -21524,7 +21524,7 @@
@@ -29,7 +29,7 @@
   stdlib.h stddef.h \
   strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \
   sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
-diff -Nur a/include/config.h.in b/include/config.h.in
+diff -ruN a/include/config.h.in b/include/config.h.in
 --- a/include/config.h.in	2010-07-26 18:29:12.192113524 +0900
 +++ b/include/config.h.in	2010-07-26 20:46:08.265182869 +0900
 @@ -599,6 +599,9 @@
@@ -42,7 +42,7 @@
  /* Define to 1 if you have the `port_create' function. */
  #undef HAVE_PORT_CREATE
  
-diff -Nur a/sql/mysqld.cc b/sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-07-07 03:33:05.278972002 +0400
 +++ b/sql/mysqld.cc	2010-07-07 03:33:05.788972002 +0400
 @@ -55,6 +55,10 @@

=== modified file 'error_pad.patch'
--- error_pad.patch	2010-09-14 16:56:59 +0000
+++ error_pad.patch	2010-10-19 00:19:43 +0000
@@ -5,7 +5,7 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -Nur a/extra/comp_err.c b/extra/comp_err.c
+diff -ruN a/extra/comp_err.c b/extra/comp_err.c
 --- a/extra/comp_err.c	2010-08-03 17:24:24.000000000 +0000
 +++ b/extra/comp_err.c	2010-09-14 16:49:28.000000000 +0000
 @@ -30,11 +30,12 @@

=== modified file 'innodb_deadlock_count.patch'
--- innodb_deadlock_count.patch	2010-10-01 01:50:14 +0000
+++ innodb_deadlock_count.patch	2010-10-19 00:19:43 +0000
@@ -5,7 +5,7 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -Nur a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
+diff -ruN a/storage/innodb_plugin/handler/ha_innodb.cc b/storage/innodb_plugin/handler/ha_innodb.cc
 --- a/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-10 15:32:14.468241191 +0400
 +++ b/storage/innodb_plugin/handler/ha_innodb.cc	2010-08-10 15:32:14.926992081 +0400
 @@ -546,6 +546,8 @@
@@ -17,7 +17,7 @@
    {"dblwr_writes",
    (char*) &export_vars.innodb_dblwr_writes,		  SHOW_LONG},
    {"dict_tables",
-diff -Nur a/storage/innodb_plugin/include/lock0lock.h b/storage/innodb_plugin/include/lock0lock.h
+diff -ruN a/storage/innodb_plugin/include/lock0lock.h b/storage/innodb_plugin/include/lock0lock.h
 --- a/storage/innodb_plugin/include/lock0lock.h	2010-08-10 15:32:14.478241628 +0400
 +++ b/storage/innodb_plugin/include/lock0lock.h	2010-08-10 15:32:14.926992081 +0400
 @@ -43,6 +43,7 @@
@@ -28,7 +28,7 @@
  
  /*********************************************************************//**
  Gets the size of a lock struct.
-diff -Nur a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
+diff -ruN a/storage/innodb_plugin/include/srv0srv.h b/storage/innodb_plugin/include/srv0srv.h
 --- a/storage/innodb_plugin/include/srv0srv.h	2010-08-10 15:32:14.478241628 +0400
 +++ b/storage/innodb_plugin/include/srv0srv.h	2010-08-10 15:32:14.936991959 +0400
 @@ -673,6 +673,7 @@
@@ -39,7 +39,7 @@
  	ulint innodb_dblwr_pages_written;	/*!< srv_dblwr_pages_written */
  	ulint innodb_dblwr_writes;		/*!< srv_dblwr_writes */
  	ibool innodb_have_atomic_builtins;	/*!< HAVE_ATOMIC_BUILTINS */
-diff -Nur a/storage/innodb_plugin/lock/lock0lock.c b/storage/innodb_plugin/lock/lock0lock.c
+diff -ruN a/storage/innodb_plugin/lock/lock0lock.c b/storage/innodb_plugin/lock/lock0lock.c
 --- a/storage/innodb_plugin/lock/lock0lock.c	2010-08-10 15:32:14.478241628 +0400
 +++ b/storage/innodb_plugin/lock/lock0lock.c	2010-08-10 15:32:14.936991959 +0400
 @@ -3330,6 +3330,7 @@
@@ -50,7 +50,7 @@
  		fputs("*** WE ROLL BACK TRANSACTION (2)\n",
  		      lock_latest_err_file);
  		break;
-diff -Nur a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
+diff -ruN a/storage/innodb_plugin/srv/srv0srv.c b/storage/innodb_plugin/srv/srv0srv.c
 --- a/storage/innodb_plugin/srv/srv0srv.c	2010-08-10 15:32:14.478241628 +0400
 +++ b/storage/innodb_plugin/srv/srv0srv.c	2010-08-10 15:32:14.936991959 +0400
 @@ -435,7 +435,7 @@

=== modified file 'log_connection_error.patch'
--- log_connection_error.patch	2010-09-14 16:34:51 +0000
+++ log_connection_error.patch	2010-10-19 00:19:43 +0000
@@ -5,7 +5,7 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -Nur a/mysql-test/r/connect.result b/mysql-test/r/connect.result
+diff -ruN a/mysql-test/r/connect.result b/mysql-test/r/connect.result
 --- a/mysql-test/r/connect.result	2010-07-28 16:47:46.895318726 +0400
 +++ b/mysql-test/r/connect.result	2010-07-28 16:47:48.234134231 +0400
 @@ -1,3 +1,4 @@
@@ -18,7 +18,7 @@
  # -- End of 5.1 tests
  # ------------------------------------------------------------------
 +set global log_warnings=1;
-diff -Nur a/mysql-test/t/connect.test b/mysql-test/t/connect.test
+diff -ruN a/mysql-test/t/connect.test b/mysql-test/t/connect.test
 --- a/mysql-test/t/connect.test	2010-07-28 16:47:46.865318816 +0400
 +++ b/mysql-test/t/connect.test	2010-07-28 16:47:48.057260581 +0400
 @@ -1,3 +1,5 @@
@@ -32,7 +32,7 @@
  --source include/wait_until_count_sessions.inc
  
 +set global log_warnings=1;
-diff -Nur a/patch_info/log_connection_error.patch b/patch_info/log_connection_error.patch
+diff -ruN a/patch_info/log_connection_error.patch b/patch_info/log_connection_error.patch
 --- a/patch_info/log_connection_error.patch	1970-01-01 03:00:00.000000000 +0300
 +++ b/patch_info/log_connection_error.patch	2010-07-28 16:47:47.634070367 +0400
 @@ -0,0 +1,6 @@
@@ -42,7 +42,7 @@
 +Author=Percona <[e-mail]>
 +License=GPL
 +Comment=
-diff -Nur a/sql/mysqld.cc b/sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-07-28 16:47:47.105319218 +0400
 +++ b/sql/mysqld.cc	2010-07-28 16:47:47.644101813 +0400
 @@ -5049,6 +5049,10 @@

=== modified file 'mysql-syslog.patch'
--- mysql-syslog.patch	2010-09-14 16:34:51 +0000
+++ mysql-syslog.patch	2010-10-19 00:19:43 +0000
@@ -5,7 +5,7 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -Nur a/client/client_priv.h b/client/client_priv.h
+diff -ruN a/client/client_priv.h b/client/client_priv.h
 --- a/client/client_priv.h	2010-08-08 14:12:42.229338865 +0400
 +++ b/client/client_priv.h	2010-08-08 14:12:43.068089277 +0400
 @@ -90,6 +90,7 @@
@@ -16,7 +16,7 @@
    OPT_FIRST_SLAVE,
    OPT_ALL,
    OPT_MAX_CLIENT_OPTION
-diff -Nur a/client/mysql.cc b/client/mysql.cc
+diff -ruN a/client/mysql.cc b/client/mysql.cc
 --- a/client/mysql.cc	2010-08-08 14:12:42.229338865 +0400
 +++ b/client/mysql.cc	2010-08-08 14:12:43.488088866 +0400
 @@ -43,6 +43,9 @@

=== modified file 'percona-support.patch'
--- percona-support.patch	2010-08-23 11:04:47 +0000
+++ percona-support.patch	2010-10-19 00:19:43 +0000
@@ -5,7 +5,7 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -Nur a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
+diff -ruN a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
 --- a/scripts/mysql_install_db.sh       2009-08-08 09:20:07.000000000 +0000
 +++ b/scripts/mysql_install_db.sh       2009-08-08 09:29:23.000000000 +0000
 @@ -469,6 +469,8 @@

=== modified file 'query_cache_enhance.patch'
--- query_cache_enhance.patch	2010-09-23 13:15:03 +0000
+++ query_cache_enhance.patch	2010-10-19 00:19:43 +0000
@@ -5,7 +5,7 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -Nur a/patch_info/query_cache.patch b/patch_info/query_cache.patch
+diff -ruN a/patch_info/query_cache.patch b/patch_info/query_cache.patch
 --- a/patch_info/query_cache_enhance.patch	1970-01-01 03:00:00.000000000 +0300
 +++ b/patch_info/query_cache_enhance.patch	2010-07-21 01:42:09.650424002 +0400
 @@ -0,0 +1,14 @@
@@ -23,7 +23,7 @@
 +2010-07 - Fix crash (query_cache_with_comments.patch)
 +2010-07 - Fix incorrect behavior diff (query_cache_with_comments.patch)
 +2010-09 - Merge patches to one
-diff -Nur a/sql/mysqld.cc b/sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-07-28 16:47:41.134069529 +0400
 +++ b/sql/mysqld.cc	2010-07-28 16:47:41.704071184 +0400
 @@ -524,6 +524,7 @@
@@ -53,7 +53,7 @@
    {"use_global_long_query_time", OPT_USE_GLOBAL_LONG_QUERY_TIME,
     "Control always use global long_query_time or local long_query_time.",
     (uchar**) &opt_use_global_long_query_time, (uchar**) &opt_use_global_long_query_time,
-diff -Nur a/sql/mysql_priv.h b/sql/mysql_priv.h
+diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
 --- a/sql/mysql_priv.h	2010-07-28 16:47:41.144071083 +0400
 +++ b/sql/mysql_priv.h	2010-07-28 16:47:41.714068826 +0400
 @@ -2087,6 +2087,7 @@
@@ -64,7 +64,7 @@
  extern my_bool opt_use_global_long_query_time;
  extern my_bool opt_slow_query_log_microseconds_timestamp;
  extern my_bool sp_automatic_privileges, opt_noacl;
-diff -Nur a/sql/query_strip_comments.h b/sql/query_strip_comments.h
+diff -ruN a/sql/query_strip_comments.h b/sql/query_strip_comments.h
 --- a/sql/query_strip_comments.h	1970-01-01 03:00:00.000000000 +0300
 +++ b/sql/query_strip_comments.h	2010-07-28 16:47:41.724072335 +0400
 @@ -0,0 +1,37 @@
@@ -105,7 +105,7 @@
 +
 +#endif // HAVE_QUERY_CACHE
 +#endif // _SQL_QUERY_STRIPC_COMMENTS_H_
-diff -Nur a/sql/set_var.cc b/sql/set_var.cc
+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-07-28 16:47:41.124069093 +0400
 +++ b/sql/set_var.cc	2010-07-28 16:47:41.734068580 +0400
 @@ -124,8 +124,10 @@
@@ -231,7 +231,7 @@
  int set_var::check(THD *thd)
  {
    if (var->is_readonly())
-diff -Nur a/sql/sql_cache.cc b/sql/sql_cache.cc
+diff -ruN a/sql/sql_cache.cc b/sql/sql_cache.cc
 --- a/sql/sql_cache.cc	2010-07-28 16:47:41.134069529 +0400
 +++ b/sql/sql_cache.cc	2010-07-28 16:47:41.754069731 +0400
 @@ -286,6 +286,7 @@
@@ -763,7 +763,7 @@
  
  #endif /*HAVE_QUERY_CACHE*/
 +
-diff -Nur a/sql/sql_class.h b/sql/sql_class.h
+diff -ruN a/sql/sql_class.h b/sql/sql_class.h
 --- a/sql/sql_class.h	2010-07-28 16:47:41.134069529 +0400
 +++ b/sql/sql_class.h	2010-07-28 16:47:41.764070446 +0400
 @@ -22,7 +22,9 @@
@@ -787,7 +787,7 @@
  
    inline char *query() { return query_string.str; }
    inline uint32 query_length() { return query_string.length; }
-diff -Nur a/mysql-test/r/query_cache_disabled.result b/mysql-test/r/query_cache_disabled.result
+diff -ruN a/mysql-test/r/query_cache_disabled.result b/mysql-test/r/query_cache_disabled.result
 --- a/mysql-test/r/query_cache_disabled.result	1970-01-01 03:00:00.000000000 +0300
 +++ b/mysql-test/r/query_cache_disabled.result	2010-07-31 20:44:34.764016531 +0400
 @@ -0,0 +1,14 @@
@@ -805,12 +805,12 @@
 +Variable_name	Value
 +query_cache_size	1048576
 +SET GLOBAL query_cache_size=0;
-diff -Nur a/mysql-test/t/query_cache_disabled-master.opt b/mysql-test/t/query_cache_disabled-master.opt
+diff -ruN a/mysql-test/t/query_cache_disabled-master.opt b/mysql-test/t/query_cache_disabled-master.opt
 --- a/mysql-test/t/query_cache_disabled-master.opt	1970-01-01 03:00:00.000000000 +0300
 +++ b/mysql-test/t/query_cache_disabled-master.opt	2010-07-31 20:41:47.184017514 +0400
 @@ -0,0 +1 @@
 +--query_cache_type=0
-diff -Nur a/mysql-test/t/query_cache_disabled.test b/mysql-test/t/query_cache_disabled.test
+diff -ruN a/mysql-test/t/query_cache_disabled.test b/mysql-test/t/query_cache_disabled.test
 --- a/mysql-test/t/query_cache_disabled.test	1970-01-01 03:00:00.000000000 +0300
 +++ b/mysql-test/t/query_cache_disabled.test	2010-07-31 20:41:47.184017514 +0400
 @@ -0,0 +1,15 @@
@@ -829,7 +829,7 @@
 +SHOW GLOBAL VARIABLES LIKE 'query_cache_size';
 +SET GLOBAL query_cache_size=0;
 +
-diff -Nur a/sql/set_var.h b/sql/set_var.h
+diff -ruN a/sql/set_var.h b/sql/set_var.h
 --- a/sql/set_var.h	2010-07-31 20:42:00.884030418 +0400
 +++ b/sql/set_var.h	2010-07-31 20:41:47.224016185 +0400
 @@ -519,10 +519,16 @@
@@ -853,7 +853,7 @@
    }
    bool update(THD *thd, set_var *var);
    void set_default(THD *thd, enum_var_type type);
-diff -Nur a/sql/share/errmsg.txt b/sql/share/errmsg.txt
+diff -ruN a/sql/share/errmsg.txt b/sql/share/errmsg.txt
 --- a/sql/share/errmsg.txt	2010-07-09 16:35:08.000000000 +0400
 +++ b/sql/share/errmsg.txt	2010-07-31 20:41:47.244015659 +0400
 @@ -6213,3 +6213,8 @@
@@ -865,7 +865,7 @@
 +ER_QUERY_CACHE_DISABLED
 +  eng "Query cache is disabled; restart the server with query_cache_type=1 to enable it"
 +
-diff -Nur a/sql/sql_cache.h b/sql/sql_cache.h
+diff -ruN a/sql/sql_cache.h b/sql/sql_cache.h
 --- a/sql/sql_cache.h	2010-07-09 16:35:15.000000000 +0400
 +++ b/sql/sql_cache.h	2010-07-31 20:41:47.264017369 +0400
 @@ -279,8 +279,11 @@

=== modified file 'remove_fcntl_excessive_calls.patch'
--- remove_fcntl_excessive_calls.patch	2010-08-23 11:04:47 +0000
+++ remove_fcntl_excessive_calls.patch	2010-10-19 00:19:43 +0000
@@ -5,7 +5,7 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -Nur a/patch_info/remove_fcntl_excessive_calls.info b/patch_info/remove_fcntl_excessive_calls.info
+diff -ruN a/patch_info/remove_fcntl_excessive_calls.info b/patch_info/remove_fcntl_excessive_calls.info
 --- a/patch_info/remove_fcntl_excessive_calls.info	1970-01-01 03:00:00.000000000 +0300
 +++ b/patch_info/remove_fcntl_excessive_calls.info	2010-07-22 21:42:08.560424001 +0400
 @@ -0,0 +1,6 @@
@@ -15,7 +15,7 @@
 +Author=This is a port of the official fix.
 +License=GPL
 +Comment=
-diff -Nur a/sql/net_serv.cc b/sql/net_serv.cc
+diff -ruN a/sql/net_serv.cc b/sql/net_serv.cc
 --- a/sql/net_serv.cc	2010-06-03 19:50:27.000000000 +0400
 +++ b/sql/net_serv.cc	2010-07-22 21:40:30.680424001 +0400
 @@ -139,7 +139,7 @@

=== modified file 'response-time-distribution.patch'
--- response-time-distribution.patch	2010-09-14 20:53:59 +0000
+++ response-time-distribution.patch	2010-10-19 00:19:43 +0000
@@ -5,7 +5,7 @@
 #!!! notice !!!
 # Any small change to this file in the main branch
 # should be done or reviewed by the maintainer!
-diff -Nur a/include/mysql_com.h b/include/mysql_com.h
+diff -ruN a/include/mysql_com.h b/include/mysql_com.h
 --- a/include/mysql_com.h	2010-09-14 20:27:52.000000000 +0000
 +++ b/include/mysql_com.h	2010-09-14 20:31:41.000000000 +0000
 @@ -128,10 +128,11 @@
@@ -24,7 +24,7 @@
  
  #define CLIENT_LONG_PASSWORD	1	/* new more secure passwords */
  #define CLIENT_FOUND_ROWS	2	/* Found instead of affected rows */
-diff -Nur a/patch_info/response-time-distribution.info b/patch_info/response-time-distribution.info
+diff -ruN a/patch_info/response-time-distribution.info b/patch_info/response-time-distribution.info
 --- a/patch_info/response-time-distribution.info	1970-01-01 00:00:00.000000000 +0000
 +++ b/patch_info/response-time-distribution.info	2010-09-14 20:31:41.000000000 +0000
 @@ -0,0 +1,9 @@
@@ -37,7 +37,7 @@
 +Changelog
 [phone] first version avaliable
 [phone] add column 'total'
-diff -Nur a/sql/lex.h b/sql/lex.h
+diff -ruN a/sql/lex.h b/sql/lex.h
 --- a/sql/lex.h	2010-09-14 20:27:52.000000000 +0000
 +++ b/sql/lex.h	2010-09-14 20:31:41.000000000 +0000
 @@ -415,6 +415,7 @@
@@ -48,7 +48,7 @@
    { "QUICK",	        SYM(QUICK)},
    { "RANGE",            SYM(RANGE_SYM)},
    { "READ",		SYM(READ_SYM)},
-diff -Nur a/sql/Makefile.am b/sql/Makefile.am
+diff -ruN a/sql/Makefile.am b/sql/Makefile.am
 --- a/sql/Makefile.am	2010-09-14 20:27:51.000000000 +0000
 +++ b/sql/Makefile.am	2010-09-14 20:31:41.000000000 +0000
 @@ -67,7 +67,7 @@
@@ -69,7 +69,7 @@
  			sql_base.cc table.cc sql_select.cc sql_insert.cc \
  			sql_profile.cc \
  			sql_prepare.cc sql_error.cc sql_locale.cc \
-diff -Nur a/sql/Makefile.in b/sql/Makefile.in
+diff -ruN a/sql/Makefile.in b/sql/Makefile.in
 --- a/sql/Makefile.in	2010-09-14 20:27:51.000000000 +0000
 +++ b/sql/Makefile.in	2010-09-14 20:31:41.000000000 +0000
 @@ -122,7 +122,7 @@
@@ -107,7 +107,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/records.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/repl_failsafe.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpl_filter.Po@am__quote@
-diff -Nur a/sql/mysqld.cc b/sql/mysqld.cc
+diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-09-14 20:27:52.000000000 +0000
 +++ b/sql/mysqld.cc	2010-09-14 20:32:15.000000000 +0000
 @@ -32,6 +32,8 @@
@@ -175,7 +175,7 @@
    {"lower_case_table_names", OPT_LOWER_CASE_TABLE_NAMES,
     "If set to 1, table names are stored in lowercase on disk and table names "
     "will be case-insensitive.  Should be set to 2 if you are using a case-"
-diff -Nur a/sql/mysql_priv.h b/sql/mysql_priv.h
+diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
 --- a/sql/mysql_priv.h	2010-09-14 20:27:52.000000000 +0000
 +++ b/sql/mysql_priv.h	2010-09-14 20:31:41.000000000 +0000
 @@ -2090,6 +2090,8 @@
@@ -187,7 +187,7 @@
  extern my_bool sp_automatic_privileges, opt_noacl;
  extern my_bool opt_old_style_user_limits, trust_function_creators;
  extern uint opt_crash_binlog_innodb;
-diff -Nur a/sql/query_response_time.cc b/sql/query_response_time.cc
+diff -ruN a/sql/query_response_time.cc b/sql/query_response_time.cc
 --- a/sql/query_response_time.cc	1970-01-01 00:00:00.000000000 +0000
 +++ b/sql/query_response_time.cc	2010-09-14 20:32:15.000000000 +0000
 @@ -0,0 +1,279 @@
@@ -470,7 +470,7 @@
 +{
 +  return query_response_time::g_collector.fill(thd,tables,cond);
 +}
-diff -Nur a/sql/query_response_time.h b/sql/query_response_time.h
+diff -ruN a/sql/query_response_time.h b/sql/query_response_time.h
 --- a/sql/query_response_time.h	1970-01-01 00:00:00.000000000 +0000
 +++ b/sql/query_response_time.h	2010-09-14 20:32:15.000000000 +0000
 @@ -0,0 +1,69 @@
@@ -543,7 +543,7 @@
 +extern int  query_response_time_fill   (THD* thd, TABLE_LIST *tables, COND *cond);
 +
 +#endif // QUERY_RESPONSE_TIME_H
-diff -Nur a/sql/set_var.cc b/sql/set_var.cc
+diff -ruN a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-09-14 20:27:52.000000000 +0000
 +++ b/sql/set_var.cc	2010-09-14 20:31:41.000000000 +0000
 @@ -1004,6 +1004,10 @@
@@ -557,7 +557,7 @@
  /* Synonym of "slow_query_log" for consistency with SHOW VARIABLES output */
  static sys_var_log_state sys_var_log_slow(&vars, "log_slow_queries",
                                            &opt_slow_log, QUERY_LOG_SLOW);
-diff -Nur a/sql/sql_parse.cc b/sql/sql_parse.cc
+diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
 --- a/sql/sql_parse.cc	2010-09-14 20:27:52.000000000 +0000
 +++ b/sql/sql_parse.cc	2010-09-14 20:31:41.000000000 +0000
 @@ -27,6 +27,7 @@
@@ -633,7 +633,7 @@
    if (options & (REFRESH_USER_STATS | REFRESH_CLIENT_STATS | REFRESH_THREAD_STATS))
    {
      pthread_mutex_lock(&LOCK_global_user_client_stats);
-diff -Nur a/sql/sql_show.cc b/sql/sql_show.cc
+diff -ruN a/sql/sql_show.cc b/sql/sql_show.cc
 --- a/sql/sql_show.cc	2010-09-14 20:27:52.000000000 +0000
 +++ b/sql/sql_show.cc	2010-09-14 20:32:15.000000000 +0000
 @@ -31,6 +31,7 @@
@@ -668,7 +668,7 @@
    {"SCHEMATA", schema_fields_info, create_schema_table,
     fill_schema_schemata, make_schemata_old_format, 0, 1, -1, 0, 0},
    {"SCHEMA_PRIVILEGES", schema_privileges_fields_info, create_schema_table,
-diff -Nur a/sql/sql_yacc.yy b/sql/sql_yacc.yy
+diff -ruN a/sql/sql_yacc.yy b/sql/sql_yacc.yy
 --- a/sql/sql_yacc.yy	2010-09-14 20:27:52.000000000 +0000
 +++ b/sql/sql_yacc.yy	2010-09-14 20:31:41.000000000 +0000
 @@ -1079,6 +1079,7 @@
@@ -710,7 +710,7 @@
          | QUICK                    {}
          | READ_ONLY_SYM            {}
          | REBUILD_SYM              {}
-diff -Nur a/sql/table.h b/sql/table.h
+diff -ruN a/sql/table.h b/sql/table.h
 --- a/sql/table.h	2010-09-14 20:27:52.000000000 +0000
 +++ b/sql/table.h	2010-09-14 20:31:41.000000000 +0000
 @@ -963,6 +963,7 @@