3659 Jon Olav Hauglid 2011-02-16 [merge]
Merge from mysql-5.5 to mysql-trunk
No conflicts
modified:
unittest/mysys/bitmap-t.c
3658 Sven Sandberg 2011-02-16 [merge]
Merged WL#5670 from 5.5 to trunk.
modified:
mysql-test/r/signal_code.result
mysql-test/r/sp-code.result
sql/mysqld.cc
sql/rpl_master.cc
sql/rpl_slave.h
sql/sp_head.cc
sql/sql_cmd.h
sql/sql_lex.h
sql/sql_parse.cc
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-trunk branch (jon.hauglid:3658 to 3659) | Jon Olav Hauglid | 16 Feb |