Problem: to handle a situation when the size of event on the master is greater than max_allowed_packet on slave, we checked for the wrong constant (ER_NET_PACKET_TOO_LARGE instead of CR_NET_PACKET_TOO_LARGE).
Solution: test for the client "packet too large" error code instead of the server one in slave I/O thread.
mysql-test/r/rpl_packet.result:
Added test case for bug #23775 "Replicated event larger that max_allowed_packet infinitely re-transmits"
mysql-test/t/rpl_packet.test:
Added test case for bug #23775 "Replicated event larger that max_allowed_packet infinitely re-transmits"
sql/slave.cc:
Test for the client "packet too large" error code instead of the server one in slave I/O thread.
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
extra/yassl/include/openssl/ssl.h:
Auto merged
extra/yassl/src/ssl.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~10:
Auto merged
into mysql.com:/home/ram/work/b22026/b22026.5.1
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
We use INT_RESULT type if all arguments are of type INT for 'if', 'case',
'coalesce' functions regardless of arguments' unsigned flag, so sometimes we can
exceed the INT bounds.
mysql-test/r/select.result:
Fix for bug #22026: Warning when using IF statement and large unsigned bigint
- test result.
mysql-test/t/select.test:
Fix for bug #22026: Warning when using IF statement and large unsigned bigint
- test case.
sql/item_cmpfunc.cc:
Fix for bug #22026: Warning when using IF statement and large unsigned bigint
- take into account unsigned flags aggregating result types:
return INT_RESULT only if two items with INT_RESULT type
have equal unsigned_flags, otherwise return REAL_RESULT.
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
mysql-test/r/range.result:
Auto merged
sql/item.cc:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
configure.in:
SCCS merged
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
storage/ndb/src/Makefile.am:
Auto merged
config/ac-macros/ha_ndbcluster.m4:
Will add the new code by hand.
configure.in:
Moving this code to ha_ndbcluster.
config/ac-macros/ha_ndbcluster.m4:
We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4
configure.in:
We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4
ndb/src/Makefile.am:
BUILT_SOURCES is uneccesary. Removing it. The real problem was related to building or not building Ndb.
configure.in:
I cut and pasted in the wrong direction I think. We don't have storage until 5.1...
---
missed storage in one more place
---
added storage back to patch after merge from 5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
mysys/string.c:
Auto merged
storage/ndb/src/Makefile.am:
Auto merged
into recycle.(none):/src/mysql-5.0-maint
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
---
I cut and pasted in the wrong direction I think. We don't have storage until 5.1...
---
missed storage in one more place
---
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
---
added storage back to patch after merge from 5.0-maint
---
Removed ndb/src dir and libndb.ver.in from it that got introduced from the 5.0-maint merge.
BitKeeper/deleted/.del-libndb.ver.in:
Rename: ndb/src/libndb.ver.in -> BitKeeper/deleted/.del-libndb.ver.in
BitKeeper/etc/ignore:
Added storage/ndb/src/libndb.ver to the ignore list
- Corrected compiler warnings and performance problems with new
dynstr_append_os_quoted function.
mysys/string.c:
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
- Fix compiler warnings.
- Used dynstr_append_mem where string length is known.
and combined, they add a platform-specific warning. The warnings
are not the goal of the test, in any case.
mysql-test/t/ps.test:
Quash platform-specific warnings.
mysqlimport.c declared the opt_use_threads variable as my_bool, but the corresponding option was defined as GET_UINT. The problem only occured on architectures with strict alignment rules.
client/mysqlimport.c:
Changed the opt_use_threads variable type to uint.
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
mysql-test/r/select.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Auto merged
tests/mysql_client_test.c:
Auto merged
- Additional patch removing check for mysql_errno on already closed
mysql1
tests/mysql_client_test.c:
No need to check mysql_errno of mysql1 which has already been closed.
files. This helps stability of multiple parallel automated test runs,
avoiding the situation where one bad build fills up disk with 1000s of
core files, causing failures in other test runs.
