2899 Alexander Nozdrin 2009-10-28
Fix automerge: s/hash_search/my_hash_search/.
modified:
sql/rpl_handler.cc
sql/sql_repl.cc
2898 Alexander Nozdrin 2009-10-28 [merge]
Merge from mysql-next-mr.
removed:
mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result
mysql-test/suite/rpl/t/rpl_row_stop_middle_update-master.opt
mysql-test/suite/rpl/t/rpl_row_stop_middle_update-slave.opt
mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test
added:
mysql-test/extra/binlog_tests/implicit.test
mysql-test/extra/rpl_tests/rpl_not_null.test
mysql-test/extra/rpl_tests/rpl_show_relaylog_events.inc
mysql-test/include/default_client.cnf
mysql-test/include/have_semisync_plugin.inc
mysql-test/include/have_ssl_communication.inc
mysql-test/include/show_relaylog_events.inc
mysql-test/r/mysql_locale_posix.result
mysql-test/suite/binlog/r/binlog_implicit_commit.result
mysql-test/suite/binlog/t/binlog_implicit_commit.test
mysql-test/suite/rpl/r/rpl_empty_master_host.result
mysql-test/suite/rpl/r/rpl_heartbeat.result
mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result
mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
mysql-test/suite/rpl/r/rpl_heartbeat_ssl.result
mysql-test/suite/rpl/r/rpl_not_null_innodb.result
mysql-test/suite/rpl/r/rpl_not_null_myisam.result
mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result
mysql-test/suite/rpl/r/rpl_semi_sync.result
mysql-test/suite/rpl/r/rpl_server_id_ignore.result
mysql-test/suite/rpl/r/rpl_slow_query_log.result
mysql-test/suite/rpl/r/rpl_spec_variables.result
mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
mysql-test/suite/rpl/r/rpl_stop_middle_group.result
mysql-test/suite/rpl/r/rpl_sync.result
mysql-test/suite/rpl/t/rpl_empty_master_host.test
mysql-test/suite/rpl/t/rpl_heartbeat.test
mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.cnf
mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test
mysql-test/suite/rpl/t/rpl_heartbeat_basic.cnf
mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
mysql-test/suite/rpl/t/rpl_heartbeat_ssl.test
mysql-test/suite/rpl/t/rpl_not_null_innodb.test
mysql-test/suite/rpl/t/rpl_not_null_myisam.test
mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test
mysql-test/suite/rpl/t/rpl_semi_sync-master.opt
mysql-test/suite/rpl/t/rpl_semi_sync-slave.opt
mysql-test/suite/rpl/t/rpl_semi_sync.test
mysql-test/suite/rpl/t/rpl_server_id_ignore-slave.opt
mysql-test/suite/rpl/t/rpl_server_id_ignore.test
mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt
mysql-test/suite/rpl/t/rpl_slow_query_log.test
mysql-test/suite/rpl/t/rpl_spec_variables-slave.opt
mysql-test/suite/rpl/t/rpl_spec_variables.test
mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test
mysql-test/suite/rpl/t/rpl_stop_middle_group.test
mysql-test/suite/rpl/t/rpl_sync-slave.opt
mysql-test/suite/rpl/t/rpl_sync.test
mysql-test/suite/rpl_ndb/r/rpl_ndb_mixed_tables.result
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-master.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables-slave.opt
mysql-test/suite/rpl_ndb/t/rpl_ndb_mixed_tables.test
mysql-test/t/mysql_locale_posix.test
plugin/semisync/
plugin/semisync/CMakeLists.txt
plugin/semisync/Makefile.am
plugin/semisync/configure.in
plugin/semisync/plug.in
plugin/semisync/semisync.cc
plugin/semisync/semisync.h
plugin/semisync/semisync_master.cc
plugin/semisync/semisync_master.h
plugin/semisync/semisync_master_plugin.cc
plugin/semisync/semisync_slave.cc
plugin/semisync/semisync_slave.h
plugin/semisync/semisync_slave_plugin.cc
sql/replication.h
sql/rpl_handler.cc
sql/rpl_handler.h
modified:
.bzr-mysql/default.conf
CMakeLists.txt
client/my_readline.h
client/mysql.cc
client/mysqladmin.cc
client/mysqlbinlog.cc
client/mysqlcheck.c
client/mysqlimport.c
client/mysqlshow.c
client/sql_string.h
configure.in
dbug/dbug.c
extra/my_print_defaults.c
include/atomic/gcc_builtins.h
include/atomic/nolock.h
include/atomic/rwlock.h
include/atomic/x86-gcc.h
include/config-win.h
include/errmsg.h
include/help_end.h
include/help_start.h
include/my_aes.h
include/my_atomic.h
include/my_bit.h
include/my_dbug.h
include/my_libwrap.h
include/my_md5.h
include/my_no_pthread.h
include/my_sys.h
include/my_uctype.h
include/myisampack.h
include/mysql/plugin.h
include/mysql/plugin.h.pp
include/mysql_com.h
include/mysql_embed.h
include/rijndael.h
include/sha1.h
include/sql_common.h
include/sslopt-case.h
include/sslopt-longopts.h
include/sslopt-vars.h
libmysql/client_settings.h
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
mysql-test/collections/default.experimental
mysql-test/extra/binlog_tests/binlog.test
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
mysql-test/extra/rpl_tests/rpl_loaddata.test
mysql-test/extra/rpl_tests/rpl_log.test
mysql-test/extra/rpl_tests/rpl_row_tabledefs.test
mysql-test/include/default_my.cnf
mysql-test/include/master-slave.inc
mysql-test/include/setup_fake_relay_log.inc
mysql-test/include/show_binlog_events.inc
mysql-test/include/show_binlog_events2.inc
mysql-test/include/test_fieldsize.inc
mysql-test/include/wait_until_disconnected.inc
mysql-test/mysql-test-run.pl
mysql-test/r/ctype_cp932_binlog_stm.result
mysql-test/r/debug_sync.result
mysql-test/r/events_bugs.result
mysql-test/r/flush_block_commit_notembedded.result
mysql-test/r/grant2.result
mysql-test/r/information_schema_db.result
mysql-test/r/locale.result
mysql-test/r/multi_update.result
mysql-test/r/mysqldump.result
mysql-test/r/sp-security.result
mysql-test/r/sp_trans_log.result
mysql-test/r/trigger_notembedded.result
mysql-test/r/view_grant.result
mysql-test/suite/binlog/r/binlog_grant.result
mysql-test/suite/binlog/r/binlog_innodb.result
mysql-test/suite/binlog/r/binlog_row_binlog.result
mysql-test/suite/binlog/r/binlog_stm_binlog.result
mysql-test/suite/binlog/t/binlog_auto_increment_bug33029.test
mysql-test/suite/binlog/t/binlog_incident.test
mysql-test/suite/binlog/t/binlog_innodb.test
mysql-test/suite/binlog/t/binlog_killed.test
mysql-test/suite/binlog/t/binlog_killed_simulate.test
mysql-test/suite/federated/federated_debug.test
mysql-test/suite/federated/federated_server.result
mysql-test/suite/federated/my.cnf
mysql-test/suite/funcs_1/r/innodb_trig_03e.result
mysql-test/suite/funcs_1/r/memory_trig_03e.result
mysql-test/suite/funcs_1/r/myisam_trig_03e.result
mysql-test/suite/funcs_1/r/ndb_trig_03e.result
mysql-test/suite/ndb/my.cnf
mysql-test/suite/parts/r/rpl_partition.result
mysql-test/suite/rpl/my.cnf
mysql-test/suite/rpl/r/rpl_000015.result
mysql-test/suite/rpl/r/rpl_binlog_grant.result
mysql-test/suite/rpl/r/rpl_bug33931.result
mysql-test/suite/rpl/r/rpl_change_master.result
mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
mysql-test/suite/rpl/r/rpl_flushlog_loop.result
mysql-test/suite/rpl/r/rpl_grant.result
mysql-test/suite/rpl/r/rpl_incident.result
mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
mysql-test/suite/rpl/r/rpl_loaddata.result
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
mysql-test/suite/rpl/r/rpl_log_pos.result
mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
mysql-test/suite/rpl/r/rpl_replicate_do.result
mysql-test/suite/rpl/r/rpl_rotate_logs.result
mysql-test/suite/rpl/r/rpl_row_basic_11bugs.result
mysql-test/suite/rpl/r/rpl_row_colSize.result
mysql-test/suite/rpl/r/rpl_row_conflicts.result
mysql-test/suite/rpl/r/rpl_row_create_table.result
mysql-test/suite/rpl/r/rpl_row_drop.result
mysql-test/suite/rpl/r/rpl_row_flsh_tbls.result
mysql-test/suite/rpl/r/rpl_row_log.result
mysql-test/suite/rpl/r/rpl_row_log_innodb.result
mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
mysql-test/suite/rpl/r/rpl_row_reset_slave.result
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
mysql-test/suite/rpl/r/rpl_row_until.result
mysql-test/suite/rpl/r/rpl_skip_error.result
mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
mysql-test/suite/rpl/r/rpl_slave_skip.result
mysql-test/suite/rpl/r/rpl_sp.result
mysql-test/suite/rpl/r/rpl_ssl.result
mysql-test/suite/rpl/r/rpl_ssl1.result
mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
mysql-test/suite/rpl/r/rpl_stm_log.result
mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
mysql-test/suite/rpl/r/rpl_stm_until.result
mysql-test/suite/rpl/r/rpl_temporary.result
mysql-test/suite/rpl/r/rpl_temporary_errors.result
mysql-test/suite/rpl/rpl_1slave_base.cnf
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl000017.test
mysql-test/suite/rpl/t/rpl_binlog_grant.test
mysql-test/suite/rpl/t/rpl_change_master.test
mysql-test/suite/rpl/t/rpl_row_create_table.test
mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test
mysql-test/suite/rpl/t/rpl_slave_skip.test
mysql-test/suite/rpl/t/rpl_slave_status.test
mysql-test/suite/rpl/t/rpl_sp.test
mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
mysql-test/suite/rpl_ndb/my.cnf
mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result
mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
mysql-test/suite/sys_vars/r/read_only_func.result
mysql-test/t/ctype_cp932_binlog_stm.test
mysql-test/t/locale.test
mysql-test/t/mysqladmin.test
mysql-test/t/mysqlbinlog.test
mysql-test/t/mysqlbinlog2.test
mysql-test/t/mysqlcheck.test
mysql-test/t/sp_trans_log.test
mysys/default.c
mysys/my_getopt.c
mysys/my_handler_errors.h
mysys/my_static.h
scripts/mysql_fix_privilege_tables.sh
sql-common/client.c
sql/CMakeLists.txt
sql/Makefile.am
sql/authors.h
sql/client_settings.h
sql/contributors.h
sql/field.h
sql/gstream.h
sql/ha_ndbcluster.h
sql/ha_ndbcluster_binlog.h
sql/ha_ndbcluster_cond.h
sql/ha_ndbcluster_tables.h
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/item.h
sql/item_cmpfunc.h
sql/item_func.h
sql/item_geofunc.h
sql/item_row.h
sql/item_strfunc.h
sql/item_subselect.h
sql/item_sum.h
sql/item_timefunc.h
sql/item_xmlfunc.h
sql/lex.h
sql/log.cc
sql/log.h
sql/log_event.cc
sql/log_event.h
sql/log_event_old.cc
sql/message.h
sql/mysql_priv.h
sql/mysqld.cc
sql/mysqld_suffix.h
sql/nt_servc.h
sql/partition_element.h
sql/partition_info.h
sql/procedure.h
sql/protocol.h
sql/repl_failsafe.h
sql/rpl_mi.cc
sql/rpl_mi.h
sql/rpl_record.cc
sql/rpl_record.h
sql/rpl_rli.cc
sql/rpl_rli.h
sql/scheduler.h
sql/set_var.cc
sql/set_var.h
sql/share/errmsg-utf8.txt
sql/share/errmsg.txt
sql/slave.cc
sql/slave.h
sql/sp_head.cc
sql/sql_acl.h
sql/sql_analyse.h
sql/sql_array.h
sql/sql_binlog.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_crypt.h
sql/sql_lex.h
sql/sql_locale.cc
sql/sql_map.h
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_partition.h
sql/sql_plugin.cc
sql/sql_plugin.h
sql/sql_repl.cc
sql/sql_repl.h
sql/sql_select.h
sql/sql_servers.h
sql/sql_sort.h
sql/sql_string.h
sql/sql_trigger.h
sql/sql_udf.h
sql/sql_view.h
sql/sql_yacc.yy
sql/structs.h
sql/table.h
sql/tzfile.h
sql/tztime.h
sql/unireg.h
storage/ndb/test/run-test/setup.cpp
strings/strings-not-used.h
vio/vio_priv.h
=== modified file 'sql/rpl_handler.cc'
--- a/sql/rpl_handler.cc 2009-09-30 11:36:35 +0000
+++ b/sql/rpl_handler.cc 2009-10-28 08:42:18 +0000
@@ -44,7 +44,7 @@ int get_user_var_int(const char *name,
{
my_bool null_val;
user_var_entry *entry=
- (user_var_entry*) hash_search(¤t_thd->user_vars,
+ (user_var_entry*) my_hash_search(¤t_thd->user_vars,
(uchar*) name, strlen(name));
if (!entry)
return 1;
@@ -59,7 +59,7 @@ int get_user_var_real(const char *name,
{
my_bool null_val;
user_var_entry *entry=
- (user_var_entry*) hash_search(¤t_thd->user_vars,
+ (user_var_entry*) my_hash_search(¤t_thd->user_vars,
(uchar*) name, strlen(name));
if (!entry)
return 1;
@@ -75,7 +75,7 @@ int get_user_var_str(const char *name, c
String str;
my_bool null_val;
user_var_entry *entry=
- (user_var_entry*) hash_search(¤t_thd->user_vars,
+ (user_var_entry*) my_hash_search(¤t_thd->user_vars,
(uchar*) name, strlen(name));
if (!entry)
return 1;
=== modified file 'sql/sql_repl.cc'
--- a/sql/sql_repl.cc 2009-10-28 07:55:44 +0000
+++ b/sql/sql_repl.cc 2009-10-28 08:42:18 +0000
@@ -377,7 +377,7 @@ static ulonglong get_heartbeat_period(TH
my_bool null_value;
LEX_STRING name= { C_STRING_WITH_LEN("master_heartbeat_period")};
user_var_entry *entry=
- (user_var_entry*) hash_search(&thd->user_vars, (uchar*) name.str,
+ (user_var_entry*) my_hash_search(&thd->user_vars, (uchar*) name.str,
name.length);
return entry? entry->val_int(&null_value) : 0;
}
Attachment: [text/bzr-bundle] bzr/alik@sun.com-20091028084218-b0z6t01mo7ccjm6j.bundle
| Thread |
|---|
| • bzr push into mysql-5.5-next-mr-runtime branch (alik:2898 to 2899) | Alexander Nozdrin | 28 Oct |
