- update and enable mysql_dump_ignore_ct.patch

Changed files:
    mysql.spec -> 1.538
    mysql_dump_ignore_ct.patch -> 1.3
    percona.sh -> 1.14

diff --git a/mysql.spec b/mysql.spec
index a55532f3d0b9939313d576b8fbc3edd4a6a5a6df..0f7fec4bdaeca2dd91cb60e0e8224255becc7347 100644 (file)
--- a/mysql.spec
+++ b/mysql.spec
@@ -36,7 +36,7 @@ Summary(uk.UTF-8):    MySQL - швидкий SQL-сервер
 Summary(zh_CN.UTF-8):  MySQL数据库服务器
 Name:          mysql
 Version:       5.5.9
-Release:       5
+Release:       6
 License:       GPL + MySQL FLOSS Exception
 Group:         Applications/Databases
 # Source0Download: http://dev.mysql.com/downloads/mysql/5.5.html#downloads
@@ -77,48 +77,49 @@ Patch19:    %{name}-chain-certs.patch
 # <percona patches, updated with percona.sh>
 Patch100:      microsec_process.patch
 Patch101:      optimizer_fix.patch
-Patch102:      control_online_alter_index.patch
-Patch103:      show_temp.patch
-Patch104:      innodb_show_status.patch
-Patch105:      innodb_io_patches.patch
-Patch106:      innodb_opt_lru_count.patch
-Patch107:      innodb_extra_rseg.patch
-Patch108:      innodb_overwrite_relay_log_info.patch
-Patch109:      innodb_thread_concurrency_timer_based.patch
-Patch110:      innodb_dict_size_limit.patch
-Patch111:      innodb_split_buf_pool_mutex.patch
-Patch112:      innodb_expand_import.patch
-Patch113:      innodb_show_sys_tables.patch
-Patch114:      innodb_stats.patch
-Patch115:      innodb_recovery_patches.patch
-Patch116:      innodb_admin_command_base.patch
-Patch117:      innodb_show_lock_name.patch
-Patch118:      innodb_extend_slow.patch
-Patch119:      innodb_lru_dump_restore.patch
-Patch120:      innodb_separate_doublewrite.patch
-Patch121:      innodb_pass_corrupt_table.patch
-Patch122:      innodb_fast_checksum.patch
-Patch123:      innodb_files_extend.patch
-Patch124:      innodb_fix_misc.patch
-Patch125:      innodb_deadlock_count.patch
-Patch126:      innodb_adaptive_hash_index_partitions.patch
-Patch127:      innodb_buffer_pool_pages_i_s.patch
-Patch128:      innodb_buffer_pool_shm.patch
-Patch129:      innodb_show_status_extend.patch
-Patch130:      slow_extended.patch
-Patch131:      percona_support.patch
-Patch132:      query_cache_enhance.patch
-Patch133:      log_connection_error.patch
-Patch134:      mysql_syslog.patch
-Patch135:      response_time_distribution.patch
-Patch136:      error_pad.patch
-Patch137:      remove_fcntl_excessive_calls.patch
-Patch138:      sql_no_fcache.patch
-Patch139:      show_slave_status_nolock.patch
-Patch140:      log_warnings_suppress.patch
-Patch141:      userstat.patch
-Patch142:      bug580324.patch
-Patch143:      mysql_remove_eol_carret.patch
+Patch102:      mysql_dump_ignore_ct.patch
+Patch103:      control_online_alter_index.patch
+Patch104:      show_temp.patch
+Patch105:      innodb_show_status.patch
+Patch106:      innodb_io_patches.patch
+Patch107:      innodb_opt_lru_count.patch
+Patch108:      innodb_extra_rseg.patch
+Patch109:      innodb_overwrite_relay_log_info.patch
+Patch110:      innodb_thread_concurrency_timer_based.patch
+Patch111:      innodb_dict_size_limit.patch
+Patch112:      innodb_split_buf_pool_mutex.patch
+Patch113:      innodb_expand_import.patch
+Patch114:      innodb_show_sys_tables.patch
+Patch115:      innodb_stats.patch
+Patch116:      innodb_recovery_patches.patch
+Patch117:      innodb_admin_command_base.patch
+Patch118:      innodb_show_lock_name.patch
+Patch119:      innodb_extend_slow.patch
+Patch120:      innodb_lru_dump_restore.patch
+Patch121:      innodb_separate_doublewrite.patch
+Patch122:      innodb_pass_corrupt_table.patch
+Patch123:      innodb_fast_checksum.patch
+Patch124:      innodb_files_extend.patch
+Patch125:      innodb_fix_misc.patch
+Patch126:      innodb_deadlock_count.patch
+Patch127:      innodb_adaptive_hash_index_partitions.patch
+Patch128:      innodb_buffer_pool_pages_i_s.patch
+Patch129:      innodb_buffer_pool_shm.patch
+Patch130:      innodb_show_status_extend.patch
+Patch131:      slow_extended.patch
+Patch132:      percona_support.patch
+Patch133:      query_cache_enhance.patch
+Patch134:      log_connection_error.patch
+Patch135:      mysql_syslog.patch
+Patch136:      response_time_distribution.patch
+Patch137:      error_pad.patch
+Patch138:      remove_fcntl_excessive_calls.patch
+Patch139:      sql_no_fcache.patch
+Patch140:      show_slave_status_nolock.patch
+Patch141:      log_warnings_suppress.patch
+Patch142:      userstat.patch
+Patch143:      bug580324.patch
+Patch144:      mysql_remove_eol_carret.patch
 # </percona>
 URL:           http://www.mysql.com/products/community/
 BuildRequires: bison
@@ -602,6 +603,7 @@ mv sphinx-*/mysqlse storage/sphinx
 %patch141 -p1
 %patch142 -p1
 %patch143 -p1
+%patch144 -p1
 # </percona>
 
 # to get these files rebuild

diff --git a/mysql_dump_ignore_ct.patch b/mysql_dump_ignore_ct.patch
index 7475e0ca08d68776e5891363145628997cb9d81e..ae58526f5bf1a86e00c3c54c6c94b7938f9ddc68 100644 (file)
--- a/mysql_dump_ignore_ct.patch
+++ b/mysql_dump_ignore_ct.patch
@@ -16,9 +16,8 @@ diff -ruN a/client/client_priv.h b/client/client_priv.h
    OPT_MYSQL_NUMBER_OF_QUERY,
    OPT_IGNORE_TABLE,OPT_INSERT_IGNORE,OPT_SHOW_WARNINGS,OPT_DROP_DATABASE,
    OPT_TZ_UTC, OPT_CREATE_SLAP_SCHEMA,
-diff -ruN a/client/mysqldump.c b/client/mysqldump.c
---- a/client/mysqldump.c       2010-11-03 07:01:14.000000000 +0900
-+++ b/client/mysqldump.c       2010-12-03 13:44:55.000069761 +0900
+--- mysql-5.5.9/client/mysqldump.c~    2011-03-10 20:05:49.000000000 +0200
++++ mysql-5.5.9/client/mysqldump.c     2011-03-10 20:19:55.962339580 +0200
 @@ -101,7 +101,7 @@
                  opt_dump_triggers= 0, opt_routines=0, opt_tz_utc=1,
                  opt_slave_apply= 0, 
@@ -38,25 +37,39 @@ diff -ruN a/client/mysqldump.c b/client/mysqldump.c
    {"lines-terminated-by", OPT_LTB,
     "Lines in the output file are terminated by the given string.",
     &lines_terminated, &lines_terminated, 0, GET_STR,
-@@ -2293,13 +2296,21 @@
-       /* Make an sql-file, if path was given iow. option -T was given */
+@@ -2297,21 +2297,35 @@
        char buff[20+FN_REFLEN];
        MYSQL_FIELD *field;
-+   
+ 
 +      my_bool old_ignore_errors=ignore_errors;
 +      //fprintf(stderr, "ignore create table %d\n", opt_ignore_show_create_table_error);
 +      if (opt_ignore_show_create_table_error)
 +         ignore_errors=1;
- 
++
        my_snprintf(buff, sizeof(buff), "show create table %s", result_table);
  
-       if (switch_character_set_results(mysql, "binary") ||
-           mysql_query_with_error_report(mysql, &result, buff) ||
-           switch_character_set_results(mysql, default_charset))
-+      {
-+        ignore_errors=old_ignore_errors;
+       if (opt_set_charset)  /* Was forced to false if server is too old. */
+       {
+         if (switch_character_set_results(mysql, "binary") != 0)
++       {
++         ignore_errors=old_ignore_errors;
+           DBUG_RETURN(0);
++       }
+       }
+ 
+       if (mysql_query_with_error_report(mysql, &result, buff) != 0)
++       {
++         ignore_errors=old_ignore_errors;
          DBUG_RETURN(0);
-+      }
++       }
  
-       if (path)
+       if (opt_set_charset)  /* Was forced to false if server is too old. */
        {
+         if (switch_character_set_results(mysql, default_charset) != 0)
++       {
++         ignore_errors=old_ignore_errors;
+           DBUG_RETURN(0);
++       }
+       }
+ 
+       if (path)

diff --git a/percona.sh b/percona.sh
index ddfecd32920ed6784c7f86e5958c27c595f3c69d..275bab0ae7a53ff5a727a9f872fb3c0b3ec233a0 100644 (file)
--- a/percona.sh
+++ b/percona.sh
@@ -12,7 +12,6 @@ bzr_branch=lp:percona-server/$version
 branch=
 
 filter_names() {
-       grep -v 'mysql_dump_ignore_ct.patch' | \
        grep -v 'percona-support.patch' | \
        grep -v 'mysqld_safe_syslog.patch' | \
        grep -v 'mysql-test.diff'