Bug #17154 load data infile hangs when duplicate key encountered
mysql-test/r/ndb_load.result:
New BitKeeper file ``mysql-test/r/ndb_load.result''
mysql-test/t/ndb_load.test:
New BitKeeper file ``mysql-test/t/ndb_load.test''
mysql-test/t/rpl_create_database.test:
Updated to pass when other default engines are being used
mysql-test/r/rpl_create_database.result:
Updated to pass when other default engines are being used
mysql-test/t/rpl_row_func003-slave.opt:
new opt file to enusre innodb on slave
mysql-test/t/rpl_replicate_do.test:
Updated with order by for use during ndb testing
mysql-test/r/rpl_replicate_do.result:
Updated with order by for use during ndb testing
mysql-test/t/rpl_redirect.test:
updated with order by
mysql-test/r/rpl_redirect.result:
updated with order by
mysql-test/t/rpl_ndb_func003.test:
New func003 wrapper to use NDB engine for table creation
mysql-test/r/rpl_ndb_func003.result:
New func003 wrapper to use NDB engine for table creation
mysql-test/r/rpl_row_sp001.result:
updated with order by
mysql-test/t/rpl_row_sp001.test:
updated with order by
BitKeeper/deleted/.del-rpl_row_log.test~f6ed1be9e3ca110f:
Delete: mysql-test/extra/rpl_tests/rpl_row_log.test
mysql-test/extra/rpl_tests/rpl_log.test:
Updated test to ensure that MyISAM, and innodb engines passed even if NDB was used as default engine. Due to diff in bin log output between MyISAM, InnoDB and NDB the file had to use different wrappers and results files.
mysql-test/t/rpl_row_log.test:
part of rpl_log.test check in
mysql-test/r/rpl_row_log.result:
part of rpl_log.test check in
mysql-test/r/rpl_row_log_innodb.result:
part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-master.opt:
part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-slave.opt:
part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb.test:
part of rpl_log.test check in
mysql-test/r/rpl_ndb_log.result:
part of rpl_log.test check in
mysql-test/t/rpl_ndb_log.test:
part of rpl_log.test check in
mysql-test/t/rpl_ndb_log-master.opt:
part of rpl_log.test check in
mysql-test/t/disabled.def:
Updated with MySQL Bugs: #17158
Bug #17158 load data infile of char values into table of char with no (PK) fails to load
Bug #17081 Doing "LOAD DATA INFILE" directly after delete can cause missing data
mysql-test/r/ndb_load.result:
New BitKeeper file ``mysql-test/r/ndb_load.result''
mysql-test/t/ndb_load.test:
New BitKeeper file ``mysql-test/t/ndb_load.test''
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
sql/ha_ndbcluster.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Auto merged
storage/ndb/test/ndbapi/test_event.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
SCCS merged
If check_quick_select returns non-empty range then the function cost_group_min_max
cannot return 0 as an estimate of the number of retrieved records.
Yet the function erroneously returned 0 as the estimate in some situations.
mysql-test/r/group_min_max.result:
Added a test case for bug #16203.
mysql-test/t/group_min_max.test:
Added a test case for bug #16203.
mysql-test/r/binlog_stm_binlog.result:
Result
mysql-test/r/mysqltest.result:
Result
mysql-test/t/binlog_stm_binlog.test:
New test for replace_regex
mysql-test/t/mysqltest.test:
New test for replace_regex
into mysql.com:/extern/mysql/work/bug16568/mysql-5.0
mysql-test/r/sp.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
into mysql.com:/home/alik/Documents/AllProgs/MySQL/devel/5.1-tree
mysql-test/r/trigger-grant.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/trigger-grant.test:
Merged.
sql/sql_trigger.cc:
Merged.
mysql-test/t/disabled.def:
ndb_blob.test works again, sort of
storage/ndb/include/ndbapi/NdbBlob.hpp:
better getNull & replace+tinyblob forward-patch from 5.0
storage/ndb/src/ndbapi/NdbBlob.cpp:
better getNull & replace+tinyblob forward-patch from 5.0
storage/ndb/test/ndbapi/test_event.cpp:
getEvent()->getTable()
sql/ha_ndbcluster.cc:
return more error codes from blob calls
sql/ha_ndbcluster_binlog.cc:
return more error codes from blob calls
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
return more error codes from blob calls
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
copy and invalidate blob tables as part of main table. TODO: do not cache blob tables
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
copy and invalidate blob tables as part of main table. TODO: do not cache blob tables
mysql-test/r/ndb_blob.result:
replace+tinyblob back-patch from 5.0
mysql-test/t/ndb_blob.test:
replace+tinyblob back-patch from 5.0
ndb/src/ndbapi/NdbBlob.cpp:
replace+tinyblob back-patch from 5.0
mysql-test/r/ndb_blob.result:
do not delete unknown parts of tinyblob
mysql-test/t/ndb_blob.test:
do not delete unknown parts of tinyblob
ndb/src/ndbapi/NdbBlob.cpp:
do not delete unknown parts of tinyblob
mysql-test/r/log_tables.result:
update result
mysql-test/t/log_tables.test:
add a testcase
sql/log.cc:
take into account client charset info, while logging
into a table.
sql/log.h:
pass the charset info along with the log messages
to log them correctly
mysql-test/t/rpl000004.test:
Updated test so it would not fail when MyISAM was not default Engine
mysql-test/r/rpl000004.result:
Updated test so it would not fail when MyISAM was not default Engine
mysql-test/extra/rpl_tests/rpl000006.test:
Updated test so that it would not fail when other engines are set as default engine
mysql-test/r/rpl000006.result:
Updated test so that it would not fail when other engines are set as default engine
mysql-test/r/rpl_relay_space_myisam.result:
Rename: mysql-test/r/rpl000005.result -> mysql-test/r/rpl_relay_space_myisam.result
mysql-test/extra/rpl_tests/rpl_sv_relay_space.test:
Had to split the test cases out to use for each engine. Reason being that the data goes applies to ndb in different order. So it has to have its own result file and I want to ensure that it is not used for other tests when ndb is used as default engine. Old test case was called rpl000009.test, so it was renamed as well to give the test more meaning
mysql-test/t/rpl_relay_space_innodb-master.opt:
Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_innodb-slave.opt:
Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_innodb.test:
Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_relay_space_myisam.test:
Wrapper for old test case called rpl000009.test
mysql-test/t/rpl_ndb_relay_space.test:
Wrapper for old test case called rpl000009.test
mysql-test/r/rpl_ndb_relay_space.result:
Result file for wrapper for old test case called rpl000009.test
mysql-test/r/rpl_relay_space_innodb.result:
Result file for wrapper for old test case called rpl000009.test
mysql-test/r/rpl_relay_space_ndb.result:
Result file for wrapper for old test case called rpl000009.test
mysql-test/t/rpl000009.test:
updated to work when ndb is default engine
mysql-test/r/rpl000009.result:
updated to work when ndb is default engine
mysql-test/t/rpl_LD_INFILE.test:
Plan test cleanup
mysql-test/r/rpl_LD_INFILE.result:
Plan test cleanup
mysql-test/t/rpl_auto_increment-slave.opt:
needed to ensure test does not fail if default engine is specified
mysql-test/extra/rpl_tests/rpl_auto_increment.test:
Sorry, forgot to cleanup from debugging
mysql-test/t/rpl_ndb_auto_inc.test:
New wrapper for NDB
mysql-test/t/rpl_ndb_auto_inc-master.opt:
New wrapper for NDB
mysql-test/r/rpl_ndb_auto_inc.result:
New wrapper for NDB
mysql-test/t/disabled.def:
Updated
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/ndb/ndbcluster.sh:
Auto merged
mysql-test/r/rpl_sp.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/rpl_sp.test:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
storage/myisam/ft_update.c:
Auto merged
storage/ndb/include/logger/LogHandler.hpp:
Auto merged
storage/ndb/include/logger/Logger.hpp:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/include/mgmcommon/ConfigRetriever.hpp:
Auto merged
storage/ndb/src/common/logger/FileLogHandler.cpp:
Auto merged
storage/ndb/src/common/logger/LogHandler.cpp:
Auto merged
storage/ndb/src/common/logger/Logger.cpp:
Auto merged
storage/ndb/src/common/logger/SysLogHandler.cpp:
Auto merged
storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp:
Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
Auto merged
storage/ndb/src/kernel/main.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.hpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
Auto merged
storage/ndb/src/mgmsrv/main.cpp:
Auto merged
storage/ndb/tools/ndb_size.pl:
Auto merged
zlib/Makefile.am:
Auto merged
mysql-test/r/information_schema.result:
SCCS merged
mysql-test/t/information_schema.test:
Manual merge.
sql/ha_archive.cc:
Manual merge.
sql/share/errmsg.txt:
SCCS merged
tests/mysql_client_test.c:
Manual merge.
into mysql.com.:/data/BK/mysql-5.0_15828
mysql-test/r/date_formats.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
sql/item_timefunc.cc:
manually merging fix for bug 15282 - automerge failed as 5.0 was heavely changed
step one using local for file item_timefunc
privilege".
Corrected addition of TRIGGER privilege by "mysql_fix_privilege_tables" script.
Problem with it should have been caught by system_mysql_db/system_mysql_db_fix
tests but they were disabled. Enabled them back.
mysql-test/r/system_mysql_db.result:
Updated test results after addition of TRIGGER privilege.
mysql-test/t/disabled.def:
Enabled back test system_mysql_db/system_mysql_db_fix tests.
scripts/mysql_fix_privilege_tables.sql:
Corrected addition of TRIGGER privilege.
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
client/mysqltest.c:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/type_decimal.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/alter_table.test:
Auto merged
mysql-test/t/create.test:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/errmsg.txt:
Auto merged
mysql-test/mysql-test-run.pl:
SCCS merged
sql/sql_yacc.yy:
Manual merge: resolve the conflict with moved sp_if rule
mysql-test/t/disabled.def:
disabling new test that was added during null-merge from 5.0
the new test innodb_unsafe_binlog will be re-enabled when the
5.1 snapshot for InnoDB is applied. Disabling test rather than
removing files to make future merges easier (removing the files
would cause merge conflicts when the files are re-added in the
5.1 snapshot).
