-flag was set on field intable share instead of table
mysql-test/r/ndb_basic.result:
Bug #17179 schema creation fails
mysql-test/t/ndb_basic.test:
Bug #17179 schema creation fails
used. The problem is that the actual engine was not stored in the .par
file, causing confusion when the default engine was changed. Now the
actual storage engine is stored for subpartitions, as was intended.
mysql-test/r/partition.result:
Add new results
mysql-test/t/partition.test:
Add new regression test, marker for end of 5.1 tests
sql/ha_partition.cc:
Record correct engine type for subpartition parts, and fix use of
constant for .par extension instead of ha_par_ext variable.
For this particular bug report it was rpl_loadfile.test that did not make proper cleanup, but the patch
includes fixes for other tests aswell.
mysql-test/r/rpl_loaddata2.result:
Cleanup
mysql-test/r/rpl_redirect.result:
Cleanup
mysql-test/r/rpl_slave_status.result:
Cleanup
mysql-test/t/rpl_LD_INFILE.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_drop_temp.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ignore_table.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata2.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_m.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loaddata_s.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_loadfile.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_multi_update4.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_ndb_basic.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_redirect.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func001.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_func002.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp001.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp005.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp008.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp009.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp010.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp011.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_sp012.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig001.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_row_trig002.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_skip_error.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_slave_status.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
mysql-test/t/rpl_sp004.test:
Most rpl tests need to execute sync_slave_with_master to ensure that cleanup is done on slave
proper processing of multiple sql statements sent as a single command.
mysql-test/r/view.result:
result file update for #15943 test case
mysql-test/t/view.test:
test case added for bug #15943
mysql-test/include/not_ndb_default.inc:
New include file to skip certain tests with default engine = ndb
mysql-test/t/rpl_optimize.test:
Updated to skip test when NDB is default engine
mysql-test/extra/rpl_tests/rpl_auto_increment.test:
Updated to skip test when NDB is default engine
BitKeeper/deleted/.del-rpl_ndb_auto_inc-master.opt~e38255d94debc2c8:
Delete: mysql-test/t/rpl_ndb_auto_inc-master.opt
mysql-test/t/rpl_ndb_auto_inc.test:
updated to use with ndb
mysql-test/r/rpl_ndb_auto_inc.result:
New results
mysql-test/t/disabled.def:
Updated to remove rpl_ndb_auto_inc.test
mysql-test/extra/rpl_tests/rpl_row_blob.test:
updated to remove check table, not needed and not supported by ndb engine
mysql-test/t/rpl_ndb_blob2.test:
new ndb wrapper
mysql-test/r/rpl_ndb_blob2.result:
new results
client/Makefile.am:
Adding client_thread_libs for mysqlimport (aka it gets pthreads)
client/client_priv.h:
New option
client/mysqlimport.c:
Reworked logic to allow someone to use threads.
mysql-test/r/mysqldump.result:
New results
mysql-test/t/mysqldump.test:
Added tests for threads.
into mysql.com:/usr/home/bar/mysql-5.1-new.fscs
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
BitKeeper/deleted/.del-raid.test~501e9e00b3c27a55:
Delete: mysql-test/t/raid.test
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Test change
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
New results
mysql-test/r/ctype_ujis.result:
New results
mysql-test/r/innodb_concurrent.result:
New results.
mysql-test/r/rpl_heap.result:
New results
mysql-test/r/warnings.result:
New results
mysql-test/t/ctype_ujis.test:
Fixed ENGINE=, test should now actually function
mysql-test/t/innodb_concurrent.test:
Fixed test for engine
mysql-test/t/rpl_heap.test:
Fixed test for engine
mysql-test/t/system_mysql_db_fix.test:
Fixed setup.
mysql-test/t/warnings.test:
Removed deprecated tests
scripts/fill_func_tables.sh:
Fixed script
scripts/mysql_convert_table_format.sh:
Fixed script
sql/ha_innodb.cc:
Fixed comment
sql/sql_yacc.yy:
Removed deprecated syntax
tests/fork_big.pl:
Fixed scipt
tests/fork_big2.pl:
Fixed script
tests/mail_to_db.pl:
Fixed script
tests/mysql_client_test.c:
Fixed test
include/config-netware.h:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
netware/BUILD/compile-AUTOTOOLS:
Auto merged
netware/Makefile.am:
Auto merged
netware/my_manage.h:
Auto merged
netware/mysql_test_run.c:
Auto merged
netware/BUILD/compile-linux-tools:
Auto merged
netware/BUILD/compile-netware-END:
Auto merged
netware/BUILD/mwenv:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
server-tools/instance-manager/Makefile.am:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
storage/innobase/include/univ.i:
Auto merged
storage/innobase/os/os0thread.c:
Auto merged
storage/myisam/mi_locking.c:
Auto merged
storage/ndb/src/kernel/blocks/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
Disabled 'rpl_until' until 15886 is solved
libmysqld.vcproj:
Added "my_user.c"
VC++Files/libmysqld/libmysqld.vcproj:
Added "my_user.c"
mysql-test/t/disabled.def:
Disabled 'rpl_until' until 15886 is solved
mysql-test/lib/mtr_cases.pl:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/spatial.cc:
Auto merged
Added { ... } around float8get() macro, avoids VC7 error
message "illegal else without matching if"
mtr_report.pl:
Parse error logs to create "warnings" file
mtr_cases.pl:
Added optoion --ignore-disabled-def
Windows build now let TZ pass, removed
work around
mysql-test-run.pl, mtr_process.pl:
Back port of changes from 5.0
mysql-test/lib/mtr_process.pl:
Back port of changes from 5.0
mysql-test/mysql-test-run.pl:
Back port of changes from 5.0
mysql-test/lib/mtr_cases.pl:
Added optoion --ignore-disabled-def
Windows build now let TZ pass, removed
work around
mysql-test/lib/mtr_report.pl:
Parse error logs to create "warnings" file
sql/spatial.cc:
Added { ... } around float8get() macro, avoids VC7 error
message "illegal else without matching if"
Give space for second and third slave port
mysql-test/mysql-test-run.pl:
Give space for second and third slave port
Define shell variables for all ports, and
list these at startup
mysql-test/mysql-test-run.sh:
Give space for second and third slave port
mysql-test/mysql-test-run.sh:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.
mysql-test/lib/mtr_process.pl:
Fix race (on some platforms) when killing processes.
1. Fix index access costs for MERGE tables, set block_size=myisam_block_size/#underlying_tables
instead of 0 which it was before.
2. Make index scans on MERGE table to return records in (key_tuple, merge_table_rowid) order,
instead of just (key_tuple) order. This makes an index scan on MERGE table to be truly a ROR-scan
which is a requirement for index_merge union/intersection.
myisammrg/myrg_queue.c:
BUG#17314: Make index scans on MERGE table return records ordered by (keytuple, merge_table_rowid).
mysql-test/r/index_merge.result:
Testcase for BUG#17314
mysql-test/r/merge.result:
BUG#17314: update testcase result
mysql-test/t/index_merge.test:
Testcase for BUG#17314
sql/ha_myisammrg.cc:
BUG#17314: For MERGE tables, set handler::block_size to myisam_block_size/#underlying_tables, and not to 0.
