into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
mysql-test/r/range.result:
Auto merged
mysys/string.c:
Auto merged
sql/item.cc:
Auto merged
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 siva.hindu.god:/home/tsmith/m/inno/jan20/51
mysql-test/r/range.result:
SCCS merged
sql/item.cc:
SCCS merged
storage/innobase/dict/dict0dict.c:
Use local
storage/innobase/handler/ha_innodb.h:
Use local
Fixes:
- Bug #24299:
- Bug #25596:
innobase/dict/dict0dict.c:
Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots
Revision r36:
innodb-4.1: Port r1030 from innodb/branches/5.0:
Replace isspace() with a wrapper ib_isspace(), because on
Win32 isspace(0xa0) appears to hold. (Bug #24299)
Revision r38:
ib_isspace(c): Check for c being the null character. (Bug #25596)
Fixes bugs:
- Bug #20877: InnoDB data dictionary memory footprint is too big
- Bug #24741: existing cascade clauses disappear when adding foreign keys
mysql-test/r/innodb.result:
Applied innodb-5.1-ss1186
Revision r1186:
dict_load_foreign(): Use a local variable instead of the 10-bit field
foreign->n_fields in order to preserve ON UPDATE CASCADE and
ON DELETE CASCADE flags. For some reason, gcc does not warn about
shifting a 10-bit field to right by 24 bits. (Bug #24741)
This bug was introduced while reducing the memory footprint of the
InnoDB data dictionary (Bug #20877).
innodb.test, innodb.result: Add a test case.
mysql-test/t/innodb.test:
Applied innodb-5.1-ss1186
Revision r1186:
dict_load_foreign(): Use a local variable instead of the 10-bit field
foreign->n_fields in order to preserve ON UPDATE CASCADE and
ON DELETE CASCADE flags. For some reason, gcc does not warn about
shifting a 10-bit field to right by 24 bits. (Bug #24741)
This bug was introduced while reducing the memory footprint of the
InnoDB data dictionary (Bug #20877).
innodb.test, innodb.result: Add a test case.
storage/innobase/buf/buf0flu.c:
Applied innodb-5.1-ss1186
Revision r1168:
buf_flush_batch(): Remove the test page_count != ULINT_UNDEFINED.
The variable is initialized to zero, and after that it is only added to.
Maybe the one who introduced the variable srv_buf_pool_flushed overlooked
that there is a separate return statement for returning ULINT_UNDEFINED?
storage/innobase/dict/dict0load.c:
Applied innodb-5.1-ss1186
Revision r1186:
dict_load_foreign(): Use a local variable instead of the 10-bit field
foreign->n_fields in order to preserve ON UPDATE CASCADE and
ON DELETE CASCADE flags. For some reason, gcc does not warn about
shifting a 10-bit field to right by 24 bits. (Bug #24741)
This bug was introduced while reducing the memory footprint of the
InnoDB data dictionary (Bug #20877).
innodb.test, innodb.result: Add a test case.
storage/innobase/include/ut0ut.h:
Applied innodb-5.1-ss1186
Revision r1165:
ut_2_power_up(): Add __attribute__((const)), because otherwise this function
is repeatedly called in buf_flush_free_margin() due to the definitions
of BUF_READ_AHEAD_AREA and other macros starting with BUF_READ_AHEAD_.
storage/innobase/que/que0que.c:
Applied innodb-5.1-ss1186
Revision r1158:
Modify que_fork_start_command() to do only one pass over the thread list
instead of three.
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
