3333 Jon Olav Hauglid 2011-02-16 [merge]
Merge from mysql-5.1 to mysql-5.5
No conflicts
modified:
unittest/mysys/bitmap-t.c
3332 Sven Sandberg 2011-02-16
WL#5670: Proposal: Remove SHOW NEW MASTER statement
Removes SHOW NEW MASTER statement and all related code.
Also removes the unused function update_slave_list from repl_failsafe.cc.
@ mysql-test/r/signal_code.result
Updated result file.
The output of SHOW PROCEDURE CODE has changed, because the numerical values
of some SQLCOM_ commands have changes. This is not a problem, because
SHOW PROCEDURE CODE only exists in debug builds and the numerical values of
SQLCOM_ constants are not exposed elsewhere.
@ mysql-test/r/sp-code.result
Updated result file.
The output of SHOW PROCEDURE CODE has changed, because the numerical values
of some SQLCOM_ commands have changes. This is not a problem, because
SHOW PROCEDURE CODE only exists in debug builds and the numerical values of
SQLCOM_ constants are not exposed elsewhere.
@ sql/mysqld.cc
Remove SQLCOM_SHOW_NEW_MASTER.
@ sql/repl_failsafe.cc
Remove show_new_master, which was only used by the removed SHOW NEW MASTER statement.
Remove translate_master, which was only used by show_new_master.
Remove find_slave_event, which was only used by translate_master.
Remove find_target_pos, which was only used by translate_master.
Remove cmp_master_pos, which was only used by translate_master.
Remove update_slave_list, which was not used at all.
@ sql/repl_failsafe.h
Remove declarations of functions removed by this patch:
update_slave_list, show_new_master, translate_master, update_slave_list
Remove declarations of functions that did not exist before this patch:
handle_failsafe_rpl, load_master_data
Remove declaration of function that is static in slave.cc:
connect_to_master
@ sql/sp_head.cc
Removed SQLCOM_SHOW_NEW_MASTER
@ sql/sql_lex.h
Removed SQLCOM_SHOW_NEW_MASTER
@ sql/sql_parse.cc
Removed SQLCOM_SHOW_NEW_MASTER
@ sql/sql_repl.cc
Removed cmp_master_pos(char*,ulonglong,char*,ulonglong), which was
only used by cmp_master_pos*Slave_log_event* sev, LEX_MASTER_INFO* mi) in repl_failsafe.cc,
which has been removed.
@ sql/sql_repl.h
removed cmp_master_pos
@ sql/sql_yacc.yy
removed syntax SHOW NEW MASTER.
modified:
mysql-test/r/signal_code.result
mysql-test/r/sp-code.result
sql/mysqld.cc
sql/repl_failsafe.cc
sql/repl_failsafe.h
sql/sp_head.cc
sql/sql_lex.h
sql/sql_parse.cc
sql/sql_repl.cc
sql/sql_repl.h
sql/sql_yacc.yy
=== modified file 'unittest/mysys/bitmap-t.c'
--- a/unittest/mysys/bitmap-t.c 2011-02-16 15:26:19 +0000
+++ b/unittest/mysys/bitmap-t.c 2011-02-16 17:19:10 +0000
@@ -253,7 +253,7 @@ error2:
my_bool test_get_first_bit(MY_BITMAP *map, uint bitsize)
{
- uint i, test_bit;
+ uint i, test_bit= 0;
uint no_loops= bitsize > 128 ? 128 : bitsize;
bitmap_set_all(map);
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5 branch (jon.hauglid:3332 to 3333) | Jon Olav Hauglid | 16 Feb |