Merge lp:~percona-dev/percona-server/5.1.57-second-part into lp:~percona-dev/percona-server/5.1.57

[Oleg Tsarev]

Complete patch porting to 5.1.57

[Alexey Kopytov (akopytov)]

Oleg,

Please remove the double 'diff' line:

=== modified file 'innodb_expand_fast_index_creation.patch'
--- innodb_expand_fast_index_creation.patch 2011-04-12 10:51:41 +0000
+++ innodb_expand_fast_index_creation.patch 2011-05-11 12:57:50 +0000
@@ -5,9 +5,10 @@
 # ALTER TABLE and OPTIMIZE TABLE.
 #
 diff -ruN a/client/client_priv.h b/client/client_priv.h
+diff -ruN a/client/client_priv.h b/client/client_priv.h

review: Needs Fixing

[Oleg Tsarev (tsarev)]

Alexey, fixed

[Alexey Kopytov (akopytov)]

Can you also merge two revisions into a single one?

review: Needs Fixing

[Alexey Kopytov (akopytov)]

review: Approve

[Valentine Gostev (longbow)]

Disapproving since target branch has problems (not building)

review: Disapprove (qa)

[Oleg Tsarev (tsarev)]

Valentin - branch build OK for me.
Please explain. what the problems are you found )

[Valentine Gostev (longbow)]

Ok for me

review: Approve (qa)

=== modified file 'Makefile'
--- Makefile	2011-04-19 00:25:41 +0000
+++ Makefile	2011-05-12 15:57:55 +0000
@@ -1,6 +1,6 @@
 FETCH_CMD=wget
 MASTER_SITE=http://www.percona.com/downloads/community
-MYSQL_VERSION=5.1.56
+MYSQL_VERSION=5.1.57
 PERCONA_SERVER_VERSION=rel12.7
 PERCONA_SERVER ?=Percona-Server-$(MYSQL_VERSION)
 
 
=== modified file 'bug580324.patch'
--- bug580324.patch	2010-11-26 11:54:21 +0000
+++ bug580324.patch	2011-05-12 15:57:55 +0000
@@ -26,7 +26,7 @@
 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
-@@ -1327,10 +1327,12 @@
+@@ -1341,10 +1341,12 @@
      break;
  #else
    {
@@ -41,7 +41,7 @@
  
      /* used as fields initializator */
      lex_start(thd);
-@@ -1342,26 +1344,22 @@
+@@ -1356,26 +1358,22 @@
      /*
        We have name + wildcard in packet, separated by endzero
      */
@@ -79,7 +79,7 @@
  
      if (is_schema_db(table_list.db, table_list.db_length))
      {
-@@ -1370,9 +1368,6 @@
+@@ -1384,9 +1382,6 @@
          table_list.schema_table= schema_table;
      }
  
 
=== modified file 'bugfix48929.patch'
--- bugfix48929.patch	2011-03-13 21:40:40 +0000
+++ bugfix48929.patch	2011-05-12 15:57:55 +0000
@@ -56,7 +56,7 @@
  #define mysqld_charset &my_charset_latin1
  
  #ifdef HAVE_purify
-@@ -5118,28 +5122,49 @@
+@@ -5124,28 +5128,49 @@
  {
    my_socket sock,new_sock;
    uint error_count=0;
@@ -109,7 +109,7 @@
  #ifdef HAVE_FCNTL
    socket_flags=fcntl(unix_sock, F_GETFL, 0);
  #endif
-@@ -5149,12 +5174,15 @@
+@@ -5155,12 +5180,15 @@
    MAYBE_BROKEN_SYSCALL;
    while (!abort_loop)
    {
@@ -130,7 +130,7 @@
      {
        if (socket_errno != SOCKET_EINTR)
        {
-@@ -5164,7 +5192,7 @@
+@@ -5170,7 +5198,7 @@
        MAYBE_BROKEN_SYSCALL
        continue;
      }
@@ -139,7 +139,7 @@
      if (abort_loop)
      {
        MAYBE_BROKEN_SYSCALL;
-@@ -5172,6 +5200,21 @@
+@@ -5178,6 +5206,21 @@
      }
  
      /* Is this a new connection request ? */
@@ -161,7 +161,7 @@
  #ifdef HAVE_SYS_UN_H
      if (FD_ISSET(unix_sock,&readFDs))
      {
-@@ -5179,11 +5222,12 @@
+@@ -5185,11 +5228,12 @@
        flags= socket_flags;
      }
      else
 
=== modified file 'innodb_expand_fast_index_creation.patch'
--- innodb_expand_fast_index_creation.patch	2011-04-12 10:51:41 +0000
+++ innodb_expand_fast_index_creation.patch	2011-05-12 15:57:55 +0000
@@ -7,7 +7,7 @@
 diff -ruN a/client/client_priv.h b/client/client_priv.h
 --- a/client/client_priv.h	2011-04-11 23:22:54.000000000 +0400
 +++ b/client/client_priv.h	2011-04-11 23:22:55.000000000 +0400
-@@ -96,5 +96,6 @@
+@@ -97,5 +97,6 @@
    OPT_FIRST_SLAVE,
    OPT_ALL,
    OPT_NO_REMOVE_EOL_CARRET,
@@ -55,7 +55,7 @@
    {"insert-ignore", OPT_INSERT_IGNORE, "Insert rows with INSERT IGNORE.",
     &opt_ignore, &opt_ignore, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
     0, 0},
-@@ -2240,6 +2250,77 @@
+@@ -2246,6 +2256,77 @@
  }
  
  /*
@@ -133,7 +133,7 @@
    get_table_structure -- retrievs database structure, prints out corresponding
    CREATE statement and fills out insert_pat if the table is the type we will
    be dumping.
-@@ -2480,6 +2561,9 @@
+@@ -2486,6 +2567,9 @@
  
        row= mysql_fetch_row(result);
  
@@ -143,7 +143,7 @@
        fprintf(sql_file, (opt_compatible_mode & 3) ? "%s;\n" :
                "/*!40101 SET @saved_cs_client     = @@character_set_client */;\n"
                "/*!40101 SET character_set_client = utf8 */;\n"
-@@ -3572,6 +3656,27 @@
+@@ -3578,6 +3662,27 @@
        goto err;
      }
  
@@ -449,7 +449,7 @@
 diff -ruN a/sql/sql_table.cc b/sql/sql_table.cc
 --- a/sql/sql_table.cc	2011-04-11 23:22:40.000000000 +0400
 +++ b/sql/sql_table.cc	2011-04-11 23:44:23.000000000 +0400
-@@ -2558,7 +2558,7 @@
+@@ -2559,7 +2559,7 @@
        file                      The handler for the new table.
        key_info_buffer     OUT   An array of KEY structs for the indexes.
        key_count           OUT   The number of elements in the array.
@@ -458,7 +458,7 @@
  
    DESCRIPTION
      Prepares the table and key structures for table creation.
-@@ -2913,7 +2913,6 @@
+@@ -2914,7 +2914,6 @@
    }
  
    /* Create keys */
@@ -466,7 +466,7 @@
    List_iterator<Key> key_iterator(alter_info->key_list);
    List_iterator<Key> key_iterator2(alter_info->key_list);
    uint key_parts=0, fk_key_count=0;
-@@ -3013,6 +3012,14 @@
+@@ -3014,6 +3013,14 @@
    if (!*key_info_buffer || ! key_part_info)
      DBUG_RETURN(TRUE);				// Out of memory
  
@@ -481,7 +481,7 @@
    key_iterator.rewind();
    key_number=0;
    for (; (key=key_iterator++) ; key_number++)
-@@ -3382,8 +3389,26 @@
+@@ -3392,8 +3399,26 @@
        my_error(ER_TOO_LONG_KEY,MYF(0),max_key_length);
        DBUG_RETURN(TRUE);
      }
@@ -508,7 +508,7 @@
    if (!unique_key && !primary_key &&
        (file->ha_table_flags() & HA_REQUIRE_PRIMARY_KEY))
    {
-@@ -6081,6 +6106,10 @@
+@@ -6091,6 +6116,10 @@
    List<Create_field> new_create_list;
    /* New key definitions are added here */
    List<Key> new_key_list;
@@ -519,7 +519,7 @@
    List_iterator<Alter_drop> drop_it(alter_info->drop_list);
    List_iterator<Create_field> def_it(alter_info->create_list);
    List_iterator<Alter_column> alter_it(alter_info->alter_list);
-@@ -6093,6 +6122,7 @@
+@@ -6103,6 +6132,7 @@
    uint used_fields= create_info->used_fields;
    KEY *key_info=table->key_info;
    bool rc= TRUE;
@@ -527,7 +527,7 @@
  
    DBUG_ENTER("mysql_prepare_alter_table");
  
-@@ -6120,6 +6150,7 @@
+@@ -6130,6 +6160,7 @@
      char *tablespace= static_cast<char *>(thd->alloc(FN_LEN + 1));
      /*
         Regular alter table of disk stored table (no tablespace/storage change)
@@ -535,7 +535,7 @@
         Copy tablespace name
      */
      if (tablespace &&
-@@ -6270,7 +6301,23 @@
+@@ -6280,7 +6311,23 @@
    /*
      Collect all keys which isn't in drop list. Add only those
      for which some fields exists.
@@ -560,7 +560,7 @@
  
    for (uint i=0 ; i < table->s->keys ; i++,key_info++)
    {
-@@ -6373,6 +6420,8 @@
+@@ -6383,6 +6430,8 @@
                     test(key_info->flags & HA_GENERATED_KEY),
                     key_parts);
        new_key_list.push_back(key);
@@ -569,7 +569,7 @@
      }
    }
    {
-@@ -6380,7 +6429,21 @@
+@@ -6390,7 +6439,21 @@
      while ((key=key_it++))			// Add new keys
      {
        if (key->type != Key::FOREIGN_KEY)
@@ -592,7 +592,7 @@
        if (key->name &&
  	  !my_strcasecmp(system_charset_info,key->name,primary_key_name))
        {
-@@ -6429,12 +6492,100 @@
+@@ -6439,12 +6502,100 @@
    rc= FALSE;
    alter_info->create_list.swap(new_create_list);
    alter_info->key_list.swap(new_key_list);
@@ -693,7 +693,7 @@
    Alter table
  
    SYNOPSIS
-@@ -7218,6 +7369,12 @@
+@@ -7228,6 +7379,12 @@
    else
      create_info->data_file_name=create_info->index_file_name=0;
  
@@ -706,7 +706,7 @@
    DEBUG_SYNC(thd, "alter_table_before_create_table_no_lock");
    /*
      Create a table with a temporary name.
-@@ -7274,15 +7431,33 @@
+@@ -7284,15 +7441,33 @@
    */
    if (new_table && !(new_table->file->ha_table_flags() & HA_NO_COPY_ON_ALTER))
    {
 
=== modified file 'innodb_fast_shutdown.patch'
--- innodb_fast_shutdown.patch	2011-03-13 21:40:40 +0000
+++ innodb_fast_shutdown.patch	2011-05-12 15:57:55 +0000
@@ -200,7 +200,7 @@
  
  	srv_lock_timeout_active = TRUE;
  
-@@ -2552,7 +2555,7 @@
+@@ -2561,7 +2564,7 @@
  
  	fflush(stderr);
  
@@ -209,7 +209,7 @@
  
  	if (srv_shutdown_state < SRV_SHUTDOWN_CLEANUP) {
  
-@@ -2596,7 +2599,7 @@
+@@ -2605,7 +2608,7 @@
  	last_dump_time = time(NULL);
  
  loop:
@@ -218,7 +218,7 @@
  
  	if (srv_shutdown_state >= SRV_SHUTDOWN_CLEANUP) {
  		goto exit_func;
-@@ -2779,7 +2782,7 @@
+@@ -2788,7 +2791,7 @@
  		if (!skip_sleep) {
  		if (next_itr_time > cur_time) {
  
@@ -227,7 +227,7 @@
  			srv_main_sleeps++;
  
  			/*
-@@ -3486,9 +3489,10 @@
+@@ -3495,9 +3498,10 @@
  		mutex_exit(&kernel_mutex);
  
  		sleep_ms = 10;
 
=== modified file 'log_connection_error.patch'
--- log_connection_error.patch	2011-03-13 21:40:40 +0000
+++ log_connection_error.patch	2011-05-12 15:57:55 +0000
@@ -45,7 +45,7 @@
 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
-@@ -5064,6 +5064,10 @@
+@@ -5070,6 +5070,10 @@
  
      DBUG_PRINT("error",("Too many connections"));
      close_connection(thd, ER_CON_COUNT_ERROR, 1);
@@ -56,7 +56,7 @@
      statistic_increment(denied_connections, &LOCK_status);
      delete thd;
      DBUG_VOID_RETURN;
-@@ -5451,6 +5455,10 @@
+@@ -5457,6 +5461,10 @@
      if (!(thd->net.vio= vio_new_win32pipe(hConnectedPipe)) ||
  	my_net_init(&thd->net, thd->net.vio))
      {
@@ -67,7 +67,7 @@
        close_connection(thd, ER_OUT_OF_RESOURCES, 1);
        delete thd;
        continue;
-@@ -5646,6 +5654,10 @@
+@@ -5652,6 +5660,10 @@
                                                     event_conn_closed)) ||
                          my_net_init(&thd->net, thd->net.vio))
      {
 
=== modified file 'mysql-syslog.patch'
--- mysql-syslog.patch	2011-03-13 21:40:40 +0000
+++ mysql-syslog.patch	2011-05-12 15:57:55 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/client/client_priv.h b/client/client_priv.h
 --- a/client/client_priv.h	2011-01-07 18:46:05.000000000 +0300
 +++ b/client/client_priv.h	2011-01-07 18:53:03.000000000 +0300
-@@ -90,6 +90,9 @@
+@@ -91,6 +91,9 @@
    OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,
    OPT_DEBUG_INFO, OPT_DEBUG_CHECK, OPT_COLUMN_TYPES, OPT_ERROR_LOG_FILE,
    OPT_WRITE_BINLOG, OPT_DUMP_DATE,
 
=== modified file 'mysql_remove_eol_carret.patch'
--- mysql_remove_eol_carret.patch	2011-03-13 21:40:40 +0000
+++ mysql_remove_eol_carret.patch	2011-05-12 15:57:55 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/client/client_priv.h b/client/client_priv.h
 --- a/client/client_priv.h	2010-07-06 15:06:50.000000000 -0700
 +++ b/client/client_priv.h	2010-07-06 15:07:18.000000000 -0700
-@@ -95,5 +95,6 @@
+@@ -96,5 +96,6 @@
  #endif
    OPT_FIRST_SLAVE,
    OPT_ALL,
 
=== modified file 'normalize_patches.sh'
--- normalize_patches.sh	2011-03-13 21:40:40 +0000
+++ normalize_patches.sh	2011-05-12 15:57:55 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #ls -1 *.patch | grep -v repair | xargs bzr revert
-MYSQL_VERSION=5.1.56
+MYSQL_VERSION=5.1.57
 MYSQL_DIR=mysql-${MYSQL_VERSION}
 MYSQL_TAR_GZ=${MYSQL_DIR}.tar.gz
 echo "===== Prepare source code for patch's adaptation...";
 
=== modified file 'query_cache_enhance.patch'
--- query_cache_enhance.patch	2011-03-13 21:40:40 +0000
+++ query_cache_enhance.patch	2011-05-12 15:57:55 +0000
@@ -26,7 +26,7 @@
 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
-@@ -525,6 +525,7 @@
+@@ -526,6 +526,7 @@
  my_bool opt_log_slow_slave_statements= 0;
  my_bool opt_log_slow_sp_statements= 0;
  my_bool opt_log_slow_timestamp_every= 0;
@@ -34,7 +34,7 @@
  my_bool opt_use_global_long_query_time= 0;
  my_bool opt_slow_query_log_microseconds_timestamp= 0;
  my_bool lower_case_file_system= 0;
-@@ -5892,6 +5893,7 @@
+@@ -5898,6 +5899,7 @@
    OPT_THREAD_STATISTICS,
    OPT_OPTIMIZER_FIX,
    OPT_SUPPRESS_LOG_WARNING_1592,
@@ -42,7 +42,7 @@
    OPT_USE_GLOBAL_LONG_QUERY_TIME,
    OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
    OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
-@@ -6946,6 +6948,10 @@
+@@ -6953,6 +6955,10 @@
    {"use_global_log_slow_control", OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
      "Choose flags, wich always use the global variables. Multiple flags allowed in a comma-separated string. [none, log_slow_filter, log_slow_rate_limit, log_slow_verbosity, long_query_time, min_examined_row_limit, all]",
     0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, SLOG_UG_NONE, 0, 0},
@@ -56,7 +56,7 @@
 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
-@@ -2113,6 +2113,7 @@
+@@ -2118,6 +2118,7 @@
  extern my_bool opt_log_slow_admin_statements, opt_log_slow_slave_statements;
  extern my_bool opt_log_slow_sp_statements;
  extern my_bool opt_log_slow_timestamp_every;
@@ -119,7 +119,7 @@
  static void fix_myisam_max_sort_file_size(THD *thd, enum_var_type type);
  static void fix_max_binlog_size(THD *thd, enum_var_type type);
  static void fix_max_relay_log_size(THD *thd, enum_var_type type);
-@@ -571,9 +573,6 @@
+@@ -581,9 +583,6 @@
                                                &SV::div_precincrement);
  static sys_var_long_ptr	sys_rpl_recovery_rank(&vars, "rpl_recovery_rank",
  					      &rpl_recovery_rank);
@@ -129,7 +129,7 @@
  
  static sys_var_thd_ulong	sys_range_alloc_block_size(&vars, "range_alloc_block_size",
  						   &SV::range_alloc_block_size);
-@@ -639,14 +638,20 @@
+@@ -649,14 +648,20 @@
                                              NULL);
  
  #ifdef HAVE_QUERY_CACHE
@@ -155,7 +155,7 @@
  static sys_var_thd_bool
  sys_query_cache_wlock_invalidate(&vars, "query_cache_wlock_invalidate",
  				 &SV::query_cache_wlock_invalidate);
-@@ -930,6 +935,8 @@
+@@ -940,6 +945,8 @@
  #ifndef EMBEDDED_LIBRARY
  static sys_var_const_str_ptr    sys_repl_report_host(&vars, "report_host", &report_host);
  static sys_var_const_str_ptr    sys_repl_report_user(&vars, "report_user", &report_user);
@@ -164,7 +164,7 @@
  static sys_var_const_str_ptr    sys_repl_report_password(&vars, "report_password", &report_password);
  
  static uchar *slave_get_report_port(THD *thd)
-@@ -1240,10 +1247,9 @@
+@@ -1250,10 +1257,9 @@
  {}
  #endif /* HAVE_REPLICATION */
  
@@ -176,7 +176,7 @@
    ulong new_cache_size= query_cache.resize(query_cache_size);
  
    /*
-@@ -1257,11 +1263,35 @@
+@@ -1267,11 +1273,35 @@
  			query_cache_size, new_cache_size);
    
    query_cache_size= new_cache_size;
@@ -214,7 +214,7 @@
  static void fix_query_cache_min_res_unit(THD *thd, enum_var_type type)
  {
    query_cache_min_res_unit= 
-@@ -3619,6 +3649,16 @@
+@@ -3629,6 +3659,16 @@
    Functions to handle SET mysql_internal_variable=const_expr
  *****************************************************************************/
  
 
=== modified file 'response-time-distribution.patch'
--- response-time-distribution.patch	2011-03-13 21:40:40 +0000
+++ response-time-distribution.patch	2011-05-12 15:57:55 +0000
@@ -110,7 +110,7 @@
 diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
 --- a/sql/mysql_priv.h	2010-11-01 08:43:57.000000000 +0000
 +++ b/sql/mysql_priv.h	2010-11-01 08:52:40.000000000 +0000
-@@ -2116,6 +2116,11 @@
+@@ -2121,6 +2121,11 @@
  extern my_bool opt_query_cache_strip_comments;
  extern my_bool opt_use_global_long_query_time;
  extern my_bool opt_slow_query_log_microseconds_timestamp;
@@ -133,7 +133,7 @@
  #ifdef HAVE_SYS_PRCTL_H
  #include <sys/prctl.h>
  #endif
-@@ -528,6 +529,10 @@
+@@ -529,6 +530,10 @@
  my_bool opt_query_cache_strip_comments = 0;
  my_bool opt_use_global_long_query_time= 0;
  my_bool opt_slow_query_log_microseconds_timestamp= 0;
@@ -144,7 +144,7 @@
  my_bool lower_case_file_system= 0;
  my_bool opt_large_pages= 0;
  my_bool opt_myisam_use_mmap= 0;
-@@ -673,6 +678,7 @@
+@@ -679,6 +684,7 @@
  MY_LOCALE *my_default_lc_time_names;
  
  SHOW_COMP_OPTION have_ssl, have_symlink, have_dlopen, have_query_cache;
@@ -152,7 +152,7 @@
  SHOW_COMP_OPTION have_geometry, have_rtree_keys;
  SHOW_COMP_OPTION have_crypt, have_compress;
  SHOW_COMP_OPTION have_community_features;
-@@ -1383,6 +1389,9 @@
+@@ -1389,6 +1395,9 @@
    free_global_thread_stats();
    free_global_table_stats();
    free_global_index_stats();
@@ -162,7 +162,7 @@
  #ifdef HAVE_REPLICATION
    end_slave_list();
  #endif
-@@ -4097,6 +4106,9 @@
+@@ -4103,6 +4112,9 @@
  
    init_global_table_stats();
    init_global_index_stats();
@@ -172,7 +172,7 @@
  
    /* We have to initialize the storage engines before CSV logging */
    if (ha_init())
-@@ -5910,6 +5922,10 @@
+@@ -5916,6 +5928,10 @@
    OPT_USE_GLOBAL_LONG_QUERY_TIME,
    OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
    OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
@@ -182,8 +182,8 @@
 +#endif /* HAVE_RESPONSE_TIME_DISTRIBUTION */
    OPT_IGNORE_BUILTIN_INNODB,
    OPT_BINLOG_DIRECT_NON_TRANS_UPDATE,
-   OPT_DEFAULT_CHARACTER_SET_OLD
-@@ -6980,6 +6996,23 @@
+   OPT_DEFAULT_CHARACTER_SET_OLD,
+@@ -6987,6 +7003,23 @@
     "Use microsecond time's precision in slow query log",
     (uchar**) &opt_slow_query_log_microseconds_timestamp, (uchar**) &opt_slow_query_log_microseconds_timestamp,
     0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 1, 0},
@@ -207,7 +207,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-"
-@@ -8194,6 +8227,11 @@
+@@ -8208,6 +8241,11 @@
  #else
    have_query_cache=SHOW_OPTION_NO;
  #endif
@@ -670,7 +670,7 @@
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-11-01 08:43:57.000000000 +0000
 +++ b/sql/set_var.cc	2010-11-01 08:52:40.000000000 +0000
-@@ -1007,6 +1007,14 @@
+@@ -1017,6 +1017,14 @@
  static sys_var_use_global_long_query_time sys_use_global_long_query_time;
  static sys_var_bool_ptr       sys_slow_query_log_microseconds_timestamp(&vars, "slow_query_log_microseconds_timestamp",
                                                         &opt_slow_query_log_microseconds_timestamp);
@@ -696,7 +696,7 @@
  
  /**
    @defgroup Runtime_Environment Runtime Environment
-@@ -1750,23 +1751,37 @@
+@@ -1764,23 +1765,37 @@
      Do not log administrative statements unless the appropriate option is
      set.
    */
@@ -747,7 +747,7 @@
      }
    }
    DBUG_VOID_RETURN;
-@@ -1891,6 +1906,7 @@
+@@ -1905,6 +1920,7 @@
    case SCH_CHARSETS:
    case SCH_ENGINES:
    case SCH_COLLATIONS:
@@ -755,7 +755,7 @@
    case SCH_COLLATION_CHARACTER_SET_APPLICABILITY:
    case SCH_USER_PRIVILEGES:
    case SCH_SCHEMA_PRIVILEGES:
-@@ -7251,6 +7267,12 @@
+@@ -7265,6 +7281,12 @@
      init_global_index_stats();
      pthread_mutex_unlock(&LOCK_global_index_stats);
    }
@@ -779,7 +779,7 @@
  #include "debug_sync.h"
  
  #define STR_OR_NIL(S) ((S) ? (S) : "<nil>")
-@@ -7488,6 +7489,13 @@
+@@ -7490,6 +7491,13 @@
  
  */
  
@@ -793,7 +793,7 @@
  ST_SCHEMA_TABLE schema_tables[]=
  {
    {"CHARACTER_SETS", charsets_fields_info, create_schema_table, 
-@@ -7542,6 +7550,13 @@
+@@ -7544,6 +7552,13 @@
     1, 9, 0, OPEN_TABLE_ONLY},
    {"ROUTINES", proc_fields_info, create_schema_table, 
     fill_schema_proc, make_proc_old_format, 0, -1, -1, 0, 0},
 
=== modified file 'show_slave_status_nolock.patch'
--- show_slave_status_nolock.patch	2011-03-13 21:40:40 +0000
+++ show_slave_status_nolock.patch	2011-05-12 15:57:55 +0000
@@ -29,7 +29,7 @@
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-11-17 18:45:47.000000000 +0300
 +++ b/sql/mysqld.cc	2010-11-17 18:46:55.000000000 +0300
-@@ -3257,6 +3257,7 @@
+@@ -3263,6 +3263,7 @@
    {"show_profiles",        (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_PROFILES]), SHOW_LONG_STATUS},
    {"show_slave_hosts",     (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_HOSTS]), SHOW_LONG_STATUS},
    {"show_slave_status",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_STAT]), SHOW_LONG_STATUS},
@@ -61,7 +61,7 @@
    sql_command_flags[SQLCOM_SHOW_CREATE_PROC]=  CF_STATUS_COMMAND;
    sql_command_flags[SQLCOM_SHOW_CREATE_FUNC]=  CF_STATUS_COMMAND;
    sql_command_flags[SQLCOM_SHOW_CREATE_TRIGGER]=  CF_STATUS_COMMAND;
-@@ -2546,12 +2547,16 @@
+@@ -2560,12 +2561,16 @@
      pthread_mutex_unlock(&LOCK_active_mi);
      break;
    }
@@ -79,7 +79,7 @@
      if (active_mi != NULL)
      {
        res = show_master_info(thd, active_mi);
-@@ -2562,7 +2567,10 @@
+@@ -2576,7 +2581,10 @@
                     WARN_NO_MASTER_INFO, ER(WARN_NO_MASTER_INFO));
        my_ok(thd);
      }
 
=== modified file 'slow_extended.patch'
--- slow_extended.patch	2011-03-11 15:25:38 +0000
+++ slow_extended.patch	2011-05-12 15:57:55 +0000
@@ -547,7 +547,7 @@
  /*
    Some defines for exit codes for ::is_equal class functions.
  */
-@@ -1997,6 +2097,10 @@
+@@ -2002,6 +2102,10 @@
  extern my_bool opt_secure_auth;
  extern char* opt_secure_file_priv;
  extern my_bool opt_log_slow_admin_statements, opt_log_slow_slave_statements;
@@ -561,7 +561,7 @@
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-12-24 13:57:33.000000000 +0300
 +++ b/sql/mysqld.cc	2010-12-24 13:57:45.000000000 +0300
-@@ -519,6 +519,10 @@
+@@ -520,6 +520,10 @@
  char* opt_secure_file_priv= 0;
  my_bool opt_log_slow_admin_statements= 0;
  my_bool opt_log_slow_slave_statements= 0;
@@ -572,7 +572,7 @@
  my_bool lower_case_file_system= 0;
  my_bool opt_large_pages= 0;
  my_bool opt_myisam_use_mmap= 0;
-@@ -5792,6 +5796,11 @@
+@@ -5798,6 +5802,11 @@
    OPT_SECURE_FILE_PRIV,
    OPT_MIN_EXAMINED_ROW_LIMIT,
    OPT_LOG_SLOW_SLAVE_STATEMENTS,
@@ -584,7 +584,7 @@
  #if defined(ENABLED_DEBUG_SYNC)
    OPT_DEBUG_SYNC_TIMEOUT,
  #endif /* defined(ENABLED_DEBUG_SYNC) */
-@@ -5799,6 +5808,9 @@
+@@ -5805,6 +5814,9 @@
    OPT_SLAVE_EXEC_MODE,
    OPT_GENERAL_LOG_FILE,
    OPT_SLOW_QUERY_LOG_FILE,
@@ -593,8 +593,8 @@
 +  OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
    OPT_IGNORE_BUILTIN_INNODB,
    OPT_BINLOG_DIRECT_NON_TRANS_UPDATE,
-   OPT_DEFAULT_CHARACTER_SET_OLD
-@@ -6818,6 +6830,36 @@
+   OPT_DEFAULT_CHARACTER_SET_OLD,
+@@ -6825,6 +6837,36 @@
     "microsecond precision.",
     &long_query_time, &long_query_time, 0, GET_DOUBLE,
     REQUIRED_ARG, 10, 0, LONG_TIMEOUT, 0, 0, 0},
@@ -631,7 +631,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-"
-@@ -7968,6 +8010,10 @@
+@@ -7982,6 +8024,10 @@
    global_system_variables.old_passwords= 0;
    global_system_variables.old_alter_table= 0;
    global_system_variables.binlog_format= BINLOG_FORMAT_UNSPEC;
@@ -642,7 +642,7 @@
    /*
      Default behavior for 4.1 and 5.0 is to treat NULL values as unequal
      when collecting index statistics for MyISAM tables.
-@@ -8469,6 +8515,44 @@
+@@ -8483,6 +8529,44 @@
    case OPT_BOOTSTRAP:
      opt_noacl=opt_bootstrap=1;
      break;
@@ -690,7 +690,7 @@
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-11-29 13:37:59.000000000 +0300
 +++ b/sql/set_var.cc	2010-12-24 13:57:45.000000000 +0300
-@@ -160,6 +160,74 @@
+@@ -162,6 +162,74 @@
  
  static sys_var_chain vars = { NULL, NULL };
  
@@ -765,7 +765,7 @@
  static sys_var_thd_ulong
  sys_auto_increment_increment(&vars, "auto_increment_increment",
                               &SV::auto_increment_increment, NULL, NULL,
-@@ -891,6 +959,30 @@
+@@ -901,6 +969,30 @@
                                        QUERY_LOG_GENERAL);
  static sys_var_log_state sys_var_slow_query_log(&vars, "slow_query_log", &opt_slow_log,
                                           QUERY_LOG_SLOW);
@@ -796,7 +796,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);
-@@ -3701,6 +3793,203 @@
+@@ -3711,6 +3803,203 @@
  #endif
  }
  
@@ -1309,7 +1309,7 @@
 diff -ruN a/sql/sql_connect.cc b/sql/sql_connect.cc
 --- a/sql/sql_connect.cc	2010-11-29 13:38:17.000000000 +0300
 +++ b/sql/sql_connect.cc	2010-12-24 13:57:45.000000000 +0300
-@@ -1143,6 +1143,15 @@
+@@ -1290,6 +1290,15 @@
  
      prepare_new_connection_state(thd);
  
@@ -1328,7 +1328,7 @@
 diff -ruN a/sql/sql_parse.cc b/sql/sql_parse.cc
 --- a/sql/sql_parse.cc	2010-12-24 13:57:33.000000000 +0300
 +++ b/sql/sql_parse.cc	2010-12-24 14:06:17.000000000 +0300
-@@ -1685,7 +1685,10 @@
+@@ -1699,7 +1699,10 @@
    free_root(thd->mem_root,MYF(MY_KEEP_PREALLOC));
    DBUG_RETURN(error);
  }
@@ -1340,7 +1340,7 @@
  
  void log_slow_statement(THD *thd)
  {
-@@ -1699,6 +1702,40 @@
+@@ -1713,6 +1716,40 @@
    if (unlikely(thd->in_sub_stmt))
      DBUG_VOID_RETURN;                           // Don't set time for sub stmt
  
@@ -1381,7 +1381,7 @@
    /*
      Do not log administrative statements unless the appropriate option is
      set.
-@@ -2085,6 +2122,9 @@
+@@ -2099,6 +2136,9 @@
      context.resolve_in_table_list_only(select_lex->
                                         table_list.first);
  
@@ -1391,7 +1391,7 @@
    /*
      Reset warning count for each query that uses tables
      A better approach would be to reset this for any commands
-@@ -5814,6 +5854,21 @@
+@@ -5828,6 +5868,21 @@
    thd->rand_used= 0;
    thd->sent_row_count= thd->examined_row_count= 0;
  
@@ -1416,7 +1416,7 @@
 diff -ruN a/sql/sql_select.cc b/sql/sql_select.cc
 --- a/sql/sql_select.cc	2010-11-29 13:38:01.000000000 +0300
 +++ b/sql/sql_select.cc	2010-12-24 13:57:45.000000000 +0300
-@@ -6790,7 +6790,10 @@
+@@ -6794,7 +6794,10 @@
  	  {
  	    join->thd->server_status|=SERVER_QUERY_NO_INDEX_USED;
  	    if (statistics)
@@ -1427,7 +1427,7 @@
  	  }
  	}
  	else
-@@ -6804,7 +6807,10 @@
+@@ -6808,7 +6811,10 @@
  	  {
  	    join->thd->server_status|=SERVER_QUERY_NO_INDEX_USED;
  	    if (statistics)
@@ -1438,7 +1438,7 @@
  	  }
  	}
  	if (!table->no_keyread)
-@@ -10008,6 +10014,7 @@
+@@ -10012,6 +10018,7 @@
                (ulong) rows_limit,test(group)));
  
    status_var_increment(thd->status_var.created_tmp_tables);
@@ -1446,7 +1446,7 @@
  
    if (use_temp_pool && !(test_flags & TEST_KEEP_TMP_TABLES))
      temp_pool_slot = bitmap_lock_set_next(&temp_pool);
-@@ -10889,6 +10896,7 @@
+@@ -10893,6 +10900,7 @@
      goto err;
    }
    status_var_increment(table->in_use->status_var.created_tmp_disk_tables);
@@ -1454,7 +1454,7 @@
    share->db_record_offset= 1;
    DBUG_RETURN(0);
   err:
-@@ -10907,6 +10915,14 @@
+@@ -10911,6 +10919,14 @@
    save_proc_info=thd->proc_info;
    thd_proc_info(thd, "removing tmp table");
  
 
=== modified file 'sql_no_fcache.patch'
--- sql_no_fcache.patch	2011-04-13 13:44:38 +0000
+++ sql_no_fcache.patch	2011-05-12 15:57:55 +0000
@@ -17,7 +17,7 @@
  /*
  Dynamic_string wrapper functions. In this file use these
  wrappers, they will terminate the process if there is
-@@ -1512,6 +1514,17 @@
+@@ -1518,6 +1520,17 @@
      /* Don't switch charsets for 4.1 and earlier.  (bug#34192). */
      server_supports_switching_charsets= FALSE;
    } 
@@ -35,7 +35,7 @@
    /*
      As we're going to set SQL_MODE, it would be lost on reconnect, so we
      cannot reconnect.
-@@ -3175,7 +3188,12 @@
+@@ -3181,7 +3194,12 @@
  
      /* now build the query string */
  
@@ -49,7 +49,7 @@
      dynstr_append_checked(&query_string, filename);
      dynstr_append_checked(&query_string, "'");
  
-@@ -3225,7 +3243,12 @@
+@@ -3231,7 +3249,12 @@
        check_io(md_result_file);
      }
      
@@ -168,8 +168,8 @@
  
  #ifndef DEFAULT_SKIP_THREAD_PRIORITY
  #define DEFAULT_SKIP_THREAD_PRIORITY 0
-@@ -593,6 +598,11 @@
- ulong max_connections, max_connect_errors;
+@@ -599,6 +604,11 @@
+ ulong max_long_data_size;
  uint  max_user_connections= 0;
  ulonglong denied_connections = 0;
 +
@@ -180,7 +180,7 @@
  /**
    Limit of the total number of prepared statements in the server.
    Is necessary to protect the server against out-of-memory attacks.
-@@ -4391,6 +4401,97 @@
+@@ -4397,6 +4407,97 @@
  }
  #endif//DBUG_OFF
  
@@ -278,7 +278,7 @@
  
  #ifdef __WIN__
  int win_main(int argc, char **argv)
-@@ -4495,6 +4596,10 @@
+@@ -4501,6 +4602,10 @@
    test_lc_time_sz();
  #endif
  
@@ -289,7 +289,7 @@
    /*
      We have enough space for fiddling with the argv, continue
    */
-@@ -4696,6 +4801,10 @@
+@@ -4702,6 +4807,10 @@
    clean_up_mutexes();
    my_end(opt_endinfo ? MY_CHECK_ERROR | MY_GIVE_INFO : 0);
  
@@ -300,7 +300,7 @@
    exit(0);
    return(0);					/* purecov: deadcode */
  }
-@@ -7853,6 +7962,7 @@
+@@ -7867,6 +7976,7 @@
    {"Delayed_errors",           (char*) &delayed_insert_errors,  SHOW_LONG},
    {"Delayed_insert_threads",   (char*) &delayed_insert_threads, SHOW_LONG_NOFLUSH},
    {"Delayed_writes",           (char*) &delayed_insert_writes,  SHOW_LONG},
 
=== modified file 'suppress_log_warning_1592.patch'
--- suppress_log_warning_1592.patch	2011-03-11 15:25:38 +0000
+++ suppress_log_warning_1592.patch	2011-05-12 15:57:55 +0000
@@ -8,7 +8,7 @@
 diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
 --- a/sql/mysql_priv.h	2010-07-26 18:31:59.056061915 +0900
 +++ b/sql/mysql_priv.h	2010-07-26 18:34:10.205015964 +0900
-@@ -2106,6 +2106,7 @@
+@@ -2111,6 +2111,7 @@
  extern my_bool opt_readonly, lower_case_file_system;
  extern my_bool opt_userstat_running, opt_thread_statistics;
  extern my_bool opt_optimizer_fix;
@@ -19,7 +19,7 @@
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-07-26 18:33:52.988451388 +0900
 +++ b/sql/mysqld.cc	2010-07-26 18:34:10.203114167 +0900
-@@ -533,6 +533,7 @@
+@@ -534,6 +534,7 @@
  my_bool opt_old_style_user_limits= 0, trust_function_creators= 0;
  my_bool opt_userstat_running= 0, opt_thread_statistics= 0;
  my_bool opt_optimizer_fix= 0;
@@ -27,7 +27,7 @@
  /*
    True if there is at least one per-hour limit for some user, so we should
    check them before each query (and possibly reset counters when hour is
-@@ -5846,6 +5847,7 @@
+@@ -5852,6 +5853,7 @@
    OPT_USERSTAT_RUNNING,
    OPT_THREAD_STATISTICS,
    OPT_OPTIMIZER_FIX,
@@ -35,7 +35,7 @@
    OPT_USE_GLOBAL_LONG_QUERY_TIME,
    OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
    OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
-@@ -7351,6 +7353,10 @@
+@@ -7365,6 +7367,10 @@
     "Enable unofficial optimizer fixes.",
     (uchar**) &opt_optimizer_fix, (uchar**) &opt_optimizer_fix,
     0, GET_BOOL, NO_ARG, 1, 0, 1, 0, 1, 0},
@@ -49,7 +49,7 @@
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-07-26 18:31:59.093062279 +0900
 +++ b/sql/set_var.cc	2010-07-26 18:34:10.210061358 +0900
-@@ -563,6 +563,8 @@
+@@ -573,6 +573,8 @@
  						      &opt_thread_statistics);
  static sys_var_bool_ptr		sys_optimizer_fix(&vars, "optimizer_fix",
  						  &opt_optimizer_fix);
 
=== modified file 'userstat.patch'
--- userstat.patch	2011-03-11 15:25:38 +0000
+++ userstat.patch	2011-05-12 15:57:55 +0000
@@ -294,7 +294,7 @@
 diff -ruN a/sql/handler.h b/sql/handler.h
 --- a/sql/handler.h	2010-10-12 00:34:25.000000000 +0400
 +++ b/sql/handler.h	2010-11-24 17:28:49.000000000 +0300
-@@ -30,6 +30,10 @@
+@@ -29,6 +29,10 @@
  
  #define USING_TRANSACTIONS
  
@@ -305,7 +305,7 @@
  // the following is for checking tables
  
  #define HA_ADMIN_ALREADY_DONE	  1
-@@ -1121,6 +1125,9 @@
+@@ -1120,6 +1124,9 @@
    bool locked;
    bool implicit_emptied;                /* Can be !=0 only if HEAP */
    const COND *pushed_cond;
@@ -315,7 +315,7 @@
    /**
      next_insert_id is the next value which should be inserted into the
      auto_increment column: in a inserting-multi-row statement (like INSERT
-@@ -1158,9 +1165,11 @@
+@@ -1157,9 +1164,11 @@
      ref_length(sizeof(my_off_t)),
      ft_handler(0), inited(NONE),
      locked(FALSE), implicit_emptied(0),
@@ -329,7 +329,7 @@
    virtual ~handler(void)
    {
      DBUG_ASSERT(locked == FALSE);
-@@ -1284,6 +1293,8 @@
+@@ -1283,6 +1292,8 @@
    {
      table= table_arg;
      table_share= share;
@@ -338,7 +338,7 @@
    }
    virtual double scan_time()
    { return ulonglong2double(stats.data_file_length) / IO_SIZE + 2; }
-@@ -1628,6 +1639,8 @@
+@@ -1627,6 +1638,8 @@
    virtual bool is_crashed() const  { return 0; }
    virtual bool auto_repair() const { return 0; }
  
@@ -563,7 +563,7 @@
 diff -ruN a/sql/mysql_priv.h b/sql/mysql_priv.h
 --- a/sql/mysql_priv.h	2010-11-24 17:24:51.000000000 +0300
 +++ b/sql/mysql_priv.h	2010-11-24 17:31:34.000000000 +0300
-@@ -1164,7 +1164,17 @@
+@@ -1168,7 +1168,17 @@
  bool multi_delete_set_locks_and_link_aux_tables(LEX *lex);
  void init_max_user_conn(void);
  void init_update_queries(void);
@@ -581,7 +581,7 @@
  pthread_handler_t handle_bootstrap(void *arg);
  int mysql_execute_command(THD *thd);
  bool do_command(THD *thd);
-@@ -2040,6 +2050,7 @@
+@@ -2044,6 +2054,7 @@
  extern ulong max_connect_errors, connect_timeout;
  extern ulong slave_net_timeout, slave_trans_retries;
  extern uint max_user_connections;
@@ -589,7 +589,7 @@
  extern ulong what_to_log,flush_time;
  extern ulong query_buff_size;
  extern ulong max_prepared_stmt_count, prepared_stmt_count;
-@@ -2093,6 +2104,7 @@
+@@ -2098,6 +2109,7 @@
  extern my_bool opt_slave_compressed_protocol, use_temp_pool;
  extern ulong slave_exec_mode_options;
  extern my_bool opt_readonly, lower_case_file_system;
@@ -597,7 +597,7 @@
  extern my_bool opt_enable_named_pipe, opt_sync_frm, opt_allow_suspicious_udfs;
  extern my_bool opt_secure_auth;
  extern char* opt_secure_file_priv;
-@@ -2157,6 +2169,15 @@
+@@ -2162,6 +2174,15 @@
  extern struct system_variables max_system_variables;
  extern struct system_status_var global_status_var;
  extern struct rand_struct sql_rand;
@@ -616,7 +616,7 @@
 diff -ruN a/sql/mysqld.cc b/sql/mysqld.cc
 --- a/sql/mysqld.cc	2010-11-24 17:24:51.000000000 +0300
 +++ b/sql/mysqld.cc	2010-11-24 17:31:34.000000000 +0300
-@@ -531,6 +531,7 @@
+@@ -532,6 +532,7 @@
  uint    opt_debug_sync_timeout= 0;
  #endif /* defined(ENABLED_DEBUG_SYNC) */
  my_bool opt_old_style_user_limits= 0, trust_function_creators= 0;
@@ -624,15 +624,15 @@
  /*
    True if there is at least one per-hour limit for some user, so we should
    check them before each query (and possibly reset counters when hour is
-@@ -579,6 +580,7 @@
- ulong binlog_cache_use= 0, binlog_cache_disk_use= 0;
- ulong max_connections, max_connect_errors;
+@@ -585,6 +586,7 @@
+ */
+ ulong max_long_data_size;
  uint  max_user_connections= 0;
 +ulonglong denied_connections = 0;
  /**
    Limit of the total number of prepared statements in the server.
    Is necessary to protect the server against out-of-memory attacks.
-@@ -680,6 +682,10 @@
+@@ -686,6 +688,10 @@
  	        LOCK_global_system_variables,
  		LOCK_user_conn, LOCK_slave_list, LOCK_active_mi,
                  LOCK_connection_count;
@@ -643,7 +643,7 @@
  /**
    The below lock protects access to two global server variables:
    max_prepared_stmt_count and prepared_stmt_count. These variables
-@@ -1365,6 +1371,11 @@
+@@ -1371,6 +1377,11 @@
    x_free(opt_secure_file_priv);
    bitmap_free(&temp_pool);
    free_max_user_conn();
@@ -655,7 +655,7 @@
  #ifdef HAVE_REPLICATION
    end_slave_list();
  #endif
-@@ -1481,6 +1492,10 @@
+@@ -1487,6 +1498,10 @@
    (void) pthread_cond_destroy(&COND_thread_cache);
    (void) pthread_cond_destroy(&COND_flush_thread_cache);
    (void) pthread_cond_destroy(&COND_manager);
@@ -666,7 +666,7 @@
  }
  
  #endif /*EMBEDDED_LIBRARY*/
-@@ -3177,6 +3192,7 @@
+@@ -3183,6 +3198,7 @@
    {"show_binlog_events",   (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_BINLOG_EVENTS]), SHOW_LONG_STATUS},
    {"show_binlogs",         (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_BINLOGS]), SHOW_LONG_STATUS},
    {"show_charsets",        (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_CHARSETS]), SHOW_LONG_STATUS},
@@ -674,7 +674,7 @@
    {"show_collations",      (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_COLLATIONS]), SHOW_LONG_STATUS},
    {"show_column_types",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_COLUMN_TYPES]), SHOW_LONG_STATUS},
    {"show_contributors",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_CONTRIBUTORS]), SHOW_LONG_STATUS},
-@@ -3198,6 +3214,7 @@
+@@ -3204,6 +3220,7 @@
  #endif
    {"show_function_status", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_STATUS_FUNC]), SHOW_LONG_STATUS},
    {"show_grants",          (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_GRANTS]), SHOW_LONG_STATUS},
@@ -682,7 +682,7 @@
    {"show_keys",            (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_KEYS]), SHOW_LONG_STATUS},
    {"show_master_status",   (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_MASTER_STAT]), SHOW_LONG_STATUS},
    {"show_new_master",      (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_NEW_MASTER]), SHOW_LONG_STATUS},
-@@ -3216,9 +3233,12 @@
+@@ -3222,9 +3239,12 @@
    {"show_slave_status",    (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_SLAVE_STAT]), SHOW_LONG_STATUS},
    {"show_status",          (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_STATUS]), SHOW_LONG_STATUS},
    {"show_storage_engines", (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_STORAGE_ENGINES]), SHOW_LONG_STATUS},
@@ -695,7 +695,7 @@
    {"show_variables",       (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_VARIABLES]), SHOW_LONG_STATUS},
    {"show_warnings",        (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_WARNS]), SHOW_LONG_STATUS},
    {"slave_start",          (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SLAVE_START]), SHOW_LONG_STATUS},
-@@ -3662,6 +3682,10 @@
+@@ -3668,6 +3688,10 @@
  #endif
    (void) pthread_mutex_init(&LOCK_server_started, MY_MUTEX_INIT_FAST);
    (void) pthread_cond_init(&COND_server_started,NULL);
@@ -706,7 +706,7 @@
    sp_cache_init();
  #ifdef HAVE_EVENT_SCHEDULER
    Events::init_mutexes();
-@@ -4063,6 +4087,9 @@
+@@ -4069,6 +4093,9 @@
    if (!errmesg[0][0])
      unireg_abort(1);
  
@@ -716,7 +716,7 @@
    /* We have to initialize the storage engines before CSV logging */
    if (ha_init())
    {
-@@ -4209,6 +4236,9 @@
+@@ -4215,6 +4242,9 @@
  
    init_max_user_conn();
    init_update_queries();
@@ -726,7 +726,7 @@
    DBUG_RETURN(0);
  }
  
-@@ -5026,6 +5056,7 @@
+@@ -5032,6 +5062,7 @@
  
      DBUG_PRINT("error",("Too many connections"));
      close_connection(thd, ER_CON_COUNT_ERROR, 1);
@@ -734,7 +734,7 @@
      delete thd;
      DBUG_VOID_RETURN;
    }
-@@ -5810,6 +5841,8 @@
+@@ -5816,6 +5847,8 @@
    OPT_SLAVE_EXEC_MODE,
    OPT_GENERAL_LOG_FILE,
    OPT_SLOW_QUERY_LOG_FILE,
@@ -743,7 +743,7 @@
    OPT_USE_GLOBAL_LONG_QUERY_TIME,
    OPT_USE_GLOBAL_LOG_SLOW_CONTROL,
    OPT_SLOW_QUERY_LOG_MICROSECONDS_TIMESTAMP,
-@@ -7303,6 +7336,14 @@
+@@ -7317,6 +7350,14 @@
     &max_system_variables.net_wait_timeout, 0, GET_ULONG,
     REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT),
     0, 1, 0},
@@ -761,7 +761,7 @@
 diff -ruN a/sql/set_var.cc b/sql/set_var.cc
 --- a/sql/set_var.cc	2010-11-24 17:24:51.000000000 +0300
 +++ b/sql/set_var.cc	2010-11-24 17:31:34.000000000 +0300
-@@ -557,6 +557,10 @@
+@@ -567,6 +567,10 @@
  static sys_var_thd_ulong	sys_read_buff_size(&vars, "read_buffer_size",
  					   &SV::read_buff_size);
  static sys_var_opt_readonly	sys_readonly(&vars, "read_only", &opt_readonly);
@@ -1692,7 +1692,7 @@
    my_error(ER_ACCESS_DENIED_ERROR, MYF(0),
             thd->main_security_ctx.user,
             thd->main_security_ctx.host_or_ip,
-@@ -984,11 +1563,20 @@
+@@ -1131,11 +1710,20 @@
        my_sleep(1000);				/* must wait after eof() */
  #endif
      statistic_increment(aborted_connects,&LOCK_status);
@@ -1713,7 +1713,7 @@
    DBUG_RETURN(0);
  }
  
-@@ -1010,6 +1598,7 @@
+@@ -1157,6 +1745,7 @@
    if (thd->killed || (net->error && net->vio != 0))
    {
      statistic_increment(aborted_threads,&LOCK_status);
@@ -1721,7 +1721,7 @@
    }
  
    if (net->error && net->vio != 0)
-@@ -1136,10 +1725,14 @@
+@@ -1283,10 +1872,14 @@
    for (;;)
    {
      NET *net= &thd->net;
@@ -1736,7 +1736,7 @@
  
      prepare_new_connection_state(thd);
  
-@@ -1162,6 +1755,8 @@
+@@ -1309,6 +1902,8 @@
     
  end_thread:
      close_connection(thd, 0, 1);
@@ -1832,7 +1832,7 @@
    /*
      Commands which always take a long time are logged into
      the slow log only if opt_log_slow_admin_statements is set.
-@@ -1865,6 +1877,13 @@
+@@ -1879,6 +1891,13 @@
      thd->profiling.discard_current_query();
  #endif
      break;
@@ -1846,7 +1846,7 @@
    case SCH_OPEN_TABLES:
    case SCH_VARIABLES:
    case SCH_STATUS:
-@@ -2021,6 +2040,7 @@
+@@ -2035,6 +2054,7 @@
                         thd->security_ctx->priv_host)) &&
          check_global_access(thd, SUPER_ACL))
      {
@@ -1854,7 +1854,7 @@
        my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), "SUPER");
        DBUG_RETURN(TRUE);
      }
-@@ -5363,6 +5383,7 @@
+@@ -5377,6 +5397,7 @@
        if (!no_errors)
        {
          const char *db_name= db ? db : thd->db;
@@ -1862,7 +1862,7 @@
          my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
                   sctx->priv_user, sctx->priv_host, db_name);
        }
-@@ -5395,12 +5416,15 @@
+@@ -5409,12 +5430,15 @@
    {						// We can never grant this
      DBUG_PRINT("error",("No possible access"));
      if (!no_errors)
@@ -1878,7 +1878,7 @@
      DBUG_RETURN(TRUE);				/* purecov: tested */
    }
  
-@@ -5426,11 +5450,15 @@
+@@ -5440,11 +5464,15 @@
  
    DBUG_PRINT("error",("Access denied"));
    if (!no_errors)
@@ -1894,7 +1894,7 @@
    DBUG_RETURN(TRUE);				/* purecov: tested */
  }
  
-@@ -5459,6 +5487,7 @@
+@@ -5473,6 +5501,7 @@
  
      if (!thd->col_access && check_grant_db(thd, dst_db_name))
      {
@@ -1902,7 +1902,7 @@
        my_error(ER_DBACCESS_DENIED_ERROR, MYF(0),
                 thd->security_ctx->priv_user,
                 thd->security_ctx->priv_host,
-@@ -5540,9 +5569,12 @@
+@@ -5554,9 +5583,12 @@
          (want_access & ~(SELECT_ACL | EXTRA_ACL | FILE_ACL)))
      {
        if (!no_errors)
@@ -1915,7 +1915,7 @@
        return TRUE;
      }
      /*
-@@ -5705,6 +5737,7 @@
+@@ -5719,6 +5751,7 @@
    if ((thd->security_ctx->master_access & want_access))
      return 0;
    get_privilege_desc(command, sizeof(command), want_access);
@@ -1923,7 +1923,7 @@
    my_error(ER_SPECIFIC_ACCESS_DENIED_ERROR, MYF(0), command);
    return 1;
  #else
-@@ -6079,6 +6112,32 @@
+@@ -6093,6 +6126,32 @@
    lex_start(thd);
    mysql_reset_thd_for_next_command(thd);
  
@@ -1956,7 +1956,7 @@
    if (query_cache_send_result_to_client(thd, rawbuf, length) <= 0)
    {
      LEX *lex= thd->lex;
-@@ -6159,6 +6218,43 @@
+@@ -6173,6 +6232,43 @@
      *found_semicolon= NULL;
    }
  
@@ -2000,7 +2000,7 @@
    DBUG_VOID_RETURN;
  }
  
-@@ -7031,6 +7127,13 @@
+@@ -7045,6 +7141,13 @@
      if (flush_error_log())
        result=1;
    }
@@ -2014,7 +2014,7 @@
  #ifdef HAVE_QUERY_CACHE
    if (options & REFRESH_QUERY_CACHE_FREE)
    {
-@@ -7131,6 +7234,40 @@
+@@ -7145,6 +7248,40 @@
  #endif
   if (options & REFRESH_USER_RESOURCES)
     reset_mqh((LEX_USER *) NULL, 0);             /* purecov: inspected */
@@ -2756,7 +2756,7 @@
  
  /* collect status for all running threads */
  
-@@ -6709,6 +7017,104 @@
+@@ -6711,6 +7019,104 @@
  };
  
  
@@ -2861,7 +2861,7 @@
  ST_FIELD_INFO processlist_fields_info[]=
  {
    {"ID", 4, MYSQL_TYPE_LONGLONG, 0, 0, "Id", SKIP_OPEN_TABLE},
-@@ -6844,6 +7250,8 @@
+@@ -6846,6 +7252,8 @@
  {
    {"CHARACTER_SETS", charsets_fields_info, create_schema_table, 
     fill_schema_charsets, make_character_sets_old_format, 0, -1, -1, 0, 0},
@@ -2870,7 +2870,7 @@
    {"COLLATIONS", collation_fields_info, create_schema_table, 
     fill_schema_collation, make_old_format, 0, -1, -1, 0, 0},
    {"COLLATION_CHARACTER_SET_APPLICABILITY", coll_charset_app_fields_info,
-@@ -6853,6 +7261,8 @@
+@@ -6855,6 +7263,8 @@
     OPTIMIZE_I_S_TABLE|OPEN_VIEW_FULL},
    {"COLUMN_PRIVILEGES", column_privileges_fields_info, create_schema_table,
     fill_schema_column_privileges, 0, 0, -1, -1, 0, 0},
@@ -2879,7 +2879,7 @@
    {"ENGINES", engines_fields_info, create_schema_table,
     fill_schema_engines, make_old_format, 0, -1, -1, 0, 0},
  #ifdef HAVE_EVENT_SCHEDULER
-@@ -6909,11 +7319,17 @@
+@@ -6911,11 +7321,17 @@
     get_all_tables, make_table_names_old_format, 0, 1, 2, 1, 0},
    {"TABLE_PRIVILEGES", table_privileges_fields_info, create_schema_table,
     fill_schema_table_privileges, 0, 0, -1, -1, 0, 0},