MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Sergey Petrunia Date:March 10 2009 8:50am
Subject:bzr push into mysql-5.1-bugteam branch (sergefp:2806 to 2807)
View as plain text  
 2807 Sergey Petrunia	2009-03-10
      Post-merge fixes
modified:
  sql/mysqld.cc

 2806 Sergey Petrunia	2009-03-10 [merge]
      Merge
removed:
  mysql-test/suite/sys_vars/t/completion_type_func-master.opt
added:
  mysql-test/include/wait_show_condition.inc
  mysql-test/r/innodb_bug42419.result
  mysql-test/r/lowercase_utf8.result
  mysql-test/suite/binlog/r/binlog_sql_mode.result
  mysql-test/suite/binlog/t/binlog_sql_mode.test
  mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result
  mysql-test/suite/rpl/r/rpl_slave_load_in.result
  mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
  mysql-test/suite/rpl/t/rpl_mixed_bit_pk.test
  mysql-test/suite/rpl/t/rpl_slave_load_in.test
  mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
  mysql-test/t/innodb_bug42419.test
  mysql-test/t/lowercase_utf8-master.opt
  mysql-test/t/lowercase_utf8.test
modified:
  .bzrignore
  CMakeLists.txt
  client/mysql.cc
  client/mysqldump.c
  cmd-line-utils/libedit/makelist.sh
  cmd-line-utils/libedit/readline.c
  cmd-line-utils/libedit/readline/readline.h
  cmd-line-utils/libedit/vi.c
  configure.in
  include/config-win.h
  include/my_getopt.h
  include/my_global.h
  include/my_sys.h
  libmysqld/lib_sql.cc
  mysql-test/Makefile.am
  mysql-test/include/handler.inc
  mysql-test/include/ndb_backup.inc
  mysql-test/lib/My/CoreDump.pm
  mysql-test/lib/mtr_gcov.pl
  mysql-test/mysql-test-run.pl
  mysql-test/r/backup.result
  mysql-test/r/ddl_i18n_koi8r.result
  mysql-test/r/ddl_i18n_utf8.result
  mysql-test/r/func_math.result
  mysql-test/r/grant.result
  mysql-test/r/group_by.result
  mysql-test/r/group_min_max.result
  mysql-test/r/handler_innodb.result
  mysql-test/r/handler_myisam.result
  mysql-test/r/information_schema_db.result
  mysql-test/r/lock.result
  mysql-test/r/merge.result
  mysql-test/r/mysql.result
  mysql-test/r/mysqlbinlog.result
  mysql-test/r/mysqlcheck.result
  mysql-test/r/mysqldump-max.result
  mysql-test/r/mysqldump.result
  mysql-test/r/mysqltest.result
  mysql-test/r/openssl_1.result
  mysql-test/r/partition.result
  mysql-test/r/partition_error.result
  mysql-test/r/partition_mgm_err.result
  mysql-test/r/preload.result
  mysql-test/r/ps.result
  mysql-test/r/query_cache_debug.result
  mysql-test/r/repair.result
  mysql-test/r/row.result
  mysql-test/r/show_check.result
  mysql-test/r/skip_name_resolve.result
  mysql-test/r/sp-error.result
  mysql-test/r/sp.result
  mysql-test/r/sp_trans.result
  mysql-test/r/strict.result
  mysql-test/r/trigger-compat.result
  mysql-test/r/type_blob.result
  mysql-test/r/type_timestamp.result
  mysql-test/r/variables.result
  mysql-test/r/view_grant.result
  mysql-test/r/warnings.result
  mysql-test/suite/binlog/r/binlog_unsafe.result
  mysql-test/suite/binlog/t/binlog_unsafe.test
  mysql-test/suite/funcs_1/r/innodb_views.result
  mysql-test/suite/funcs_1/r/is_columns_innodb.result
  mysql-test/suite/funcs_1/r/is_columns_memory.result
  mysql-test/suite/funcs_1/r/is_columns_myisam.result
  mysql-test/suite/funcs_1/r/memory_views.result
  mysql-test/suite/funcs_1/r/myisam_views.result
  mysql-test/suite/funcs_1/r/ndb_views.result
  mysql-test/suite/ndb_team/t/ndb_autodiscover.test
  mysql-test/suite/parts/inc/partition_auto_increment.inc
  mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
  mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
  mysql-test/suite/parts/r/partition_alter1_1_innodb.result
  mysql-test/suite/parts/r/partition_alter1_1_myisam.result
  mysql-test/suite/parts/r/partition_alter2_1_innodb.result
  mysql-test/suite/parts/r/partition_alter2_1_myisam.result
  mysql-test/suite/parts/r/partition_alter2_2_innodb.result
  mysql-test/suite/parts/r/partition_alter2_2_myisam.result
  mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
  mysql-test/suite/parts/r/partition_auto_increment_ndb.result
  mysql-test/suite/parts/r/partition_basic_innodb.result
  mysql-test/suite/parts/r/partition_basic_myisam.result
  mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc0_archive.result
  mysql-test/suite/parts/r/partition_mgm_lc0_innodb.result
  mysql-test/suite/parts/r/partition_mgm_lc0_memory.result
  mysql-test/suite/parts/r/partition_mgm_lc0_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc0_ndb.result
  mysql-test/suite/parts/r/partition_mgm_lc1_archive.result
  mysql-test/suite/parts/r/partition_mgm_lc1_innodb.result
  mysql-test/suite/parts/r/partition_mgm_lc1_memory.result
  mysql-test/suite/parts/r/partition_mgm_lc1_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc1_ndb.result
  mysql-test/suite/parts/r/partition_mgm_lc2_archive.result
  mysql-test/suite/parts/r/partition_mgm_lc2_innodb.result
  mysql-test/suite/parts/r/partition_mgm_lc2_memory.result
  mysql-test/suite/parts/r/partition_mgm_lc2_myisam.result
  mysql-test/suite/parts/r/partition_mgm_lc2_ndb.result
  mysql-test/suite/rpl/r/rpl_failed_optimize.result
  mysql-test/suite/rpl/r/rpl_row_until.result
  mysql-test/suite/rpl/r/rpl_sp.result
  mysql-test/suite/rpl/t/rpl_row_until.test
  mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
  mysql-test/suite/sys_vars/r/auto_increment_increment_func.result
  mysql-test/suite/sys_vars/r/auto_increment_offset_basic.result
  mysql-test/suite/sys_vars/r/auto_increment_offset_func.result
  mysql-test/suite/sys_vars/r/completion_type_func.result
  mysql-test/suite/sys_vars/r/concurrent_insert_basic.result
  mysql-test/suite/sys_vars/r/connect_timeout_basic.result
  mysql-test/suite/sys_vars/r/default_week_format_basic.result
  mysql-test/suite/sys_vars/r/delayed_insert_timeout_basic.result
  mysql-test/suite/sys_vars/r/div_precision_increment_basic.result
  mysql-test/suite/sys_vars/r/expire_logs_days_basic.result
  mysql-test/suite/sys_vars/r/group_concat_max_len_basic.result
  mysql-test/suite/sys_vars/r/interactive_timeout_basic.result
  mysql-test/suite/sys_vars/r/log_bin_trust_routine_creators_basic.result
  mysql-test/suite/sys_vars/r/max_allowed_packet_basic.result
  mysql-test/suite/sys_vars/r/max_binlog_size_basic.result
  mysql-test/suite/sys_vars/r/max_connections_basic.result
  mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
  mysql-test/suite/sys_vars/r/max_error_count_basic.result
  mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
  mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result
  mysql-test/suite/sys_vars/r/max_prepared_stmt_count_basic.result
  mysql-test/suite/sys_vars/r/max_relay_log_size_basic.result
  mysql-test/suite/sys_vars/r/max_sort_length_basic.result
  mysql-test/suite/sys_vars/r/max_sp_recursion_depth_basic.result
  mysql-test/suite/sys_vars/r/myisam_data_pointer_size_basic.result
  mysql-test/suite/sys_vars/r/net_buffer_length_basic.result
  mysql-test/suite/sys_vars/r/net_read_timeout_basic.result
  mysql-test/suite/sys_vars/r/net_write_timeout_basic.result
  mysql-test/suite/sys_vars/r/optimizer_prune_level_basic.result
  mysql-test/suite/sys_vars/r/optimizer_search_depth_basic.result
  mysql-test/suite/sys_vars/r/preload_buffer_size_basic.result
  mysql-test/suite/sys_vars/r/read_buffer_size_basic.result
  mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result
  mysql-test/suite/sys_vars/r/slave_net_timeout_basic.result
  mysql-test/suite/sys_vars/r/slow_launch_time_basic.result
  mysql-test/suite/sys_vars/r/table_definition_cache_basic.result
  mysql-test/suite/sys_vars/r/table_lock_wait_timeout_basic.result
  mysql-test/suite/sys_vars/r/table_open_cache_basic.result
  mysql-test/suite/sys_vars/t/completion_type_func.test
  mysql-test/t/ddl_i18n_koi8r.test
  mysql-test/t/ddl_i18n_utf8.test
  mysql-test/t/disabled.def
  mysql-test/t/drop.test
  mysql-test/t/func_group.test
  mysql-test/t/func_math.test
  mysql-test/t/group_by.test
  mysql-test/t/group_min_max.test
  mysql-test/t/innodb_mysql.test
  mysql-test/t/lock.test
  mysql-test/t/merge.test
  mysql-test/t/mysql.test
  mysql-test/t/mysqlbinlog.test
  mysql-test/t/mysqldump-compat.test
  mysql-test/t/mysqldump.test
  mysql-test/t/mysqltest.test
  mysql-test/t/partition.test
  mysql-test/t/partition_error.test
  mysql-test/t/ps.test
  mysql-test/t/query_cache_28249.test
  mysql-test/t/query_cache_debug.test
  mysql-test/t/row.test
  mysql-test/t/show_check.test
  mysql-test/t/skip_name_resolve.test
  mysql-test/t/strict.test
  mysql-test/t/trigger-compat.test
  mysql-test/t/variables.test
  mysql-test/t/view_grant.test
  mysys/default.c
  mysys/errors.c
  mysys/my_fstream.c
  mysys/my_getopt.c
  mysys/my_pread.c
  mysys/my_write.c
  scripts/mysqldumpslow.sh
  sql/ha_partition.cc
  sql/handler.cc
  sql/item.cc
  sql/item.h
  sql/item_cmpfunc.cc
  sql/item_func.cc
  sql/log.cc
  sql/log_event.cc
  sql/log_event.h
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/opt_range.cc
  sql/protocol.cc
  sql/rpl_record.cc
  sql/rpl_rli.cc
  sql/rpl_rli.h
  sql/set_var.cc
  sql/share/errmsg.txt
  sql/sp.cc
  sql/sql_base.cc
  sql/sql_cache.cc
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_handler.cc
  sql/sql_insert.cc
  sql/sql_lex.cc
  sql/sql_lex.h
  sql/sql_load.cc
  sql/sql_parse.cc
  sql/sql_select.cc
  sql/sql_show.cc
  sql/sql_table.cc
  sql/sql_view.cc
  sql/sql_yacc.yy
  sql/unireg.cc
  storage/innobase/dict/dict0load.c
  storage/innobase/handler/ha_innodb.cc
  storage/innobase/include/rem0rec.h
  storage/innobase/include/rem0rec.ic
  storage/innobase/include/trx0roll.h
  storage/innobase/lock/lock0lock.c
  storage/innobase/trx/trx0roll.c
  storage/innobase/trx/trx0trx.c
  storage/myisam/ha_myisam.cc
  storage/myisam/mi_locking.c
  storage/myisam/myisamchk.c
  storage/myisam/myisamdef.h
  storage/myisammrg/ha_myisammrg.cc
  support-files/Makefile.am
  support-files/mysql.spec.sh
  tests/mysql_client_test.c

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-03-09 21:53:38 +0000
+++ b/sql/mysqld.cc	2009-03-10 08:49:30 +0000
@@ -8254,7 +8254,10 @@ mysqld_get_one_option(int optid,
   {
     optimizer_switch_str= argument;
     global_system_variables.optimizer_switch=
-      find_bit_type_or_exit(argument, &optimizer_switch_typelib, opt->name);
+      find_bit_type_or_exit(argument, &optimizer_switch_typelib, opt->name, 
+                            &error);
+    if (error)
+      return 1;
     break;
   }
   case OPT_ONE_THREAD:

Thread
bzr push into mysql-5.1-bugteam branch (sergefp:2806 to 2807)Sergey Petrunia10 Mar