of <parameter> IS NULL":
we must not only set Item::null_value in Item_param, but implement
Item_param::is_null() to work well with IS NULL/IS NOT NULL clauses.
mysql-test/r/ps.result:
Test case for Bug#6297: test results fixed.
mysql-test/t/ps.test:
A test case for Bug#6297 "prepared statement, wrong handling of
<parameter> IS NULL"
sql/item.h:
A fix for Bug#6297: we must not only set null_value in Item_param, but
also implement Item_param::is_null() to work well with IS NULL/
IS NOT NULL.
Item::is_null() commented.
fixed erroneous error message - set auto increment was done even if create table failed so real error message got lost behind "table not found"
and simplified code a bit
ndb/src/kernel/vm/Configuration.cpp:
corrected some erroneous size calculations
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
fixed erroneous error message - set auto increment was done even if create table failed so real error message got lost behind "table not found"
and simplified code a bit
wrong datetime values for too big argument" from 4.0 tree to 4.1 tree.
mysql-test/r/func_time.result:
Manual merge
mysql-test/t/func_time.test:
Manual merge
sql/item_timefunc.cc:
Manual merge
ndb/src/kernel/blocks/ERROR_codes.txt:
do not crash on config mismatch if release compiled
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
do not crash on config mismatch if release compiled
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
do not crash on config mismatch if release compiled
ndb/test/ndbapi/testDict.cpp:
do not crash on config mismatch if release compiled
properly" with main tree.
libmysql/libmysql.c:
Auto merged
sql-common/my_time.c:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
tests/client_test.c:
Manual merge.
into mysql.com:/home/jonas/src/wl2077
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testReadPerf.cpp:
Auto merged
(recommit in clean clone)
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
removed unused variable
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Always give all nodes in DIGETPRIMREQ
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Allow readcommited-scans to scan backup fragments
ndb/test/ndbapi/testReadPerf.cpp:
better printous
strings/ctype-mb.c:
Incorrect response with partial utf8 index:
Fill the max string with max_sort_char up to res_length bytes.
strings/ctype-uca.c:
Incorrect response with partial utf8 index.
Typo fixes for UTF8 collations.
client/Makefile.am:
Auto merged
client/mysqladmin.cc:
Auto merged
configure.in:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmclient/ndb_mgmclient.hpp:
Auto merged
ndb/src/mgmclient/ndb_mgmclient.h:
Auto merged
ndb/tools/restore/restore_main.cpp:
SCCS merged
corrected mistake in previous patch
ndb/tools/Makefile.am:
change file name to avoid conflict
ndb/tools/restore/restore_main.cpp:
corrected mistake in previous patch
