Author: glen Date: Thu Mar 10 18:24:10 2011 GMT Module: packages Tag: HEAD ---- Log message: - update and enable mysql_dump_ignore_ct.patch
---- Files affected: packages/mysql: mysql.spec (1.537 -> 1.538) , mysql_dump_ignore_ct.patch (1.2 -> 1.3) , percona.sh (1.13 -> 1.14) ---- Diffs: ================================================================ Index: packages/mysql/mysql.spec diff -u packages/mysql/mysql.spec:1.537 packages/mysql/mysql.spec:1.538 --- packages/mysql/mysql.spec:1.537 Thu Mar 10 19:02:59 2011 +++ packages/mysql/mysql.spec Thu Mar 10 19:24:05 2011 @@ -37,7 +37,7 @@ 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 @@ -78,48 +78,49 @@ # <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 @@ -603,6 +604,7 @@ %patch141 -p1 %patch142 -p1 %patch143 -p1 +%patch144 -p1 # </percona> # to get these files rebuild @@ -1228,6 +1230,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.538 2011/03/10 18:24:05 glen +- update and enable mysql_dump_ignore_ct.patch + Revision 1.537 2011/03/10 18:02:59 glen - update percona patches (mysql_dump_ignore_ct.patch needs updating) ================================================================ Index: packages/mysql/mysql_dump_ignore_ct.patch diff -u packages/mysql/mysql_dump_ignore_ct.patch:1.2 packages/mysql/mysql_dump_ignore_ct.patch:1.3 --- packages/mysql/mysql_dump_ignore_ct.patch:1.2 Sat Feb 19 23:16:59 2011 +++ packages/mysql/mysql_dump_ignore_ct.patch Thu Mar 10 19:24:05 2011 @@ -16,9 +16,8 @@ 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 @@ {"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) ================================================================ Index: packages/mysql/percona.sh diff -u packages/mysql/percona.sh:1.13 packages/mysql/percona.sh:1.14 --- packages/mysql/percona.sh:1.13 Thu Mar 10 19:02:59 2011 +++ packages/mysql/percona.sh Thu Mar 10 19:24:05 2011 @@ -12,7 +12,6 @@ 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' ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.537&r2=1.538&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql_dump_ignore_ct.patch?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/percona.sh?r1=1.13&r2=1.14&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
