CMakeLists.txt:
Moved zlib to be processed before extra as CMake doesn't handle
forward references well.
client/CMakeLists.txt:
Ensure that -DTHREADS is specified for mysqlslap.c
client/mysqlslap.c:
Removed includes which are already included in client_priv.h
Moved variable declarations to be at start of function before any
code is emitted as VSC is strict.
of its argument happened to be a decimal expression returning
the NULL value.
The crash was due to the fact the function in_decimal::set did
not take into account that val_decimal() could return 0 if
the decimal expression had been evaluated to NULL.
mysql-test/r/func_in.result:
Added a test case for bug #27362.
mysql-test/t/func_in.test:
Added a test case for bug #27362.
into clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/t/ndb_blob.test:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
Auto merged
storage/ndb/test/src/UtilTransactions.cpp:
Auto merged
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
include/my_global.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/help.result:
Auto merged
mysql-test/t/help.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
INTO clause can be specified only for the last select of a UNION and it
receives the result of the whole query. But it was wrongly allowed in
non-last selects of a UNION which leads to a confusing query result.
Now INTO allowed only in the last select of a UNION.
mysql-test/t/union.test:
Added a test case for the bug#23345: Wrongly allowed INTO in a non-last select of a UNION.
mysql-test/r/union.result:
Added a test case for the bug#23345: Wrongly allowed INTO in a non-last select of a UNION.
sql/sql_yacc.yy:
Bug#23345: Wrongly allowed INTO in a non-last select of a UNION.
Now INTO allowed only in the last select of a UNION.
running suites other tha the main one
mysql-test/mysql-test-run.pl:
Modifying to allow steeing of --secure-file-priv to 'mysql-test' when running suites
other tha the main one
- Update test to run properly on Windows.
mysql-test/t/sp-destruct.test:
Bug#27144 sp-destruct.test is disabled on Windows
- Enabled test on Windows.
- Replaced non-portable system commands (mkdir, rmdir, mv, cp, echo)
with the mysqltest builtin commands.
- Replace Windows directory seperator in error ER_NOT_FROM_FILE with
posix directory seperator for single test/result pair.
scripts/mysql_system_tables.sql:
Add time_zone to the list of mysql.event columns.
scripts/mysql_system_tables_fix.sql:
Update after a bad merge: now mysql_system_tables_fix contains
only alter definitions, no CREATE definitions (single definition
source approach that was implemented by Magnus).
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/tools/restore/Restore.cpp:
Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
Additional fix for 2-node case
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Add error insert ref for errcode = 7181
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Make GSN_GCP_NODEFINISH always be sent to DIH node requesting it
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
Auto merged
BitKeeper/deleted/.del-test_db.sql:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.h:
Auto merged
mysql-test/install_test_db.sh:
Manual merge
mysql-test/mysql-test-run.pl:
Manual merge
netware/Makefile.am:
Manual merge
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
Auto merged
BitKeeper/deleted/.del-test_db.sql:
Auto merged
mysql-test/install_test_db.sh:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.h:
Auto merged
netware/Makefile.am:
Manual merge
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
Auto merged
BitKeeper/deleted/.del-test_db.sql:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_acl.h:
Auto merged
mysql-test/install_test_db.sh:
Manual merge
mysql-test/r/flush2.result:
Manual merge
netware/Makefile.am:
Manual merge
