mysql-test/r/archive.result:
New results
mysql-test/r/csv.result:
New results
mysql-test/t/archive.test:
Adding test for new fast alter table
mysql-test/t/csv.test:
Adding test for new fast alter table
sql/ha_archive.cc:
Updating handlerton to remove warnings.
storage/csv/ha_tina.cc:
Updating handlerton to remove warnings, and updated CSV to handle fast alter table.
storage/csv/ha_tina.h:
New method.
Bug#17196, --default-storage-engine option broken
configure.in:
This is an alpha
configure.in:
This is an alpha
sql/sql_plugin.cc:
Bug#17196, --default-storage-engine option broken
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
mysql-test/t/federated.test:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/ha_federated.h:
Auto merged
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
storage/innobase/btr/btr0sea.c:
SCCS merged
storage/innobase/fil/fil0fil.c:
Auto merged
storage/innobase/include/btr0sea.ic:
Manual merge: use local.
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqltest.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Auto merged
mysql-test/r/rpl_loaddata_s.result:
Auto merged
mysql-test/r/rpl_misc_functions.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_stm_000001.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/trigger-compat.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/information_schema.test:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_loaddata_m.test:
Auto merged
mysql-test/t/rpl_loaddata_s.test:
Auto merged
mysql-test/t/rpl_misc_functions.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/trigger-grant.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql-common/client.c:
Auto merged
tests/mysql_client_test.c:
Auto merged
WL#1034 (Internal CRON)
(with post-review fix)
mysql-test/r/events.result:
update the result
mysql-test/t/events.test:
use --sleep instead of select sleep()
enable some scheduler related tests. They were disabled because of a hang that
happened. The hang is fixed with this bugfix.
sql/event.cc:
- evex_remove_from_cache reports back whether the in_memory
object was deleted or was scheduled. In case scheduling then
don't delete it from outside but let it do it itself
- move out db interaction code out of evex_drop_event to db_drop_event
so it can be called from outter space :)
sql/event_priv.h:
- export the new function db_drop_event()
sql/event_timed.cc:
- use db_drop_event() and don't implement the dropping ourselves
sql/sql_parse.cc:
- some debug info about the status code returned.
mysql-test/r/rpl_failed_optimize.result:
Updates test result
mysql-test/r/rpl_insert_id.result:
Updates test result
mysql-test/r/rpl_loaddata.result:
Updates test result
mysql-test/r/rpl_loaddata_s.result:
Updates test result
mysql-test/r/rpl_multi_update3.result:
Updates test result
scripts/make_binary_distribution.sh:
As of 5.1, any package will contain both an optimized and a debugging server,
built with identical configuration (features / table handlers).
This "mysqld-debug" must be contained in the package.
Also, the server will not be stripped any more.
Also, get rid of the old compatibility symlink "safe_mysqld" dating back to 4.0.
mysql-test/r/ndb_binlog_ignore_db.result:
New BitKeeper file ``mysql-test/r/ndb_binlog_ignore_db.result''
mysql-test/t/ndb_binlog_ignore_db-master.opt:
New BitKeeper file ``mysql-test/t/ndb_binlog_ignore_db-master.opt''
mysql-test/t/ndb_binlog_ignore_db.test:
New BitKeeper file ``mysql-test/t/ndb_binlog_ignore_db.test''
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
client/mysqltest.c:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Auto merged
mysql-test/r/rpl_loaddata_s.result:
Auto merged
mysql-test/r/rpl_misc_functions.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_stm_000001.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl_loaddata.test:
Auto merged
mysql-test/t/rpl_loaddata_m.test:
Auto merged
mysql-test/t/rpl_loaddata_s.test:
Auto merged
mysql-test/t/rpl_misc_functions.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/type_varchar.test:
Auto merged
mysql-test/r/mysqltest.result:
Merge 5.0 -> 5.1
mysql-test/t/trigger-grant.test:
"Use local" when merging 5.0 -> 5.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/read_only.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysql-test/r/trigger-compat.result:
Merge 5.0 -> 5.1
no test case needed since simply creating a partitioned table
reproduces it.
sql/sql_partition.cc:
the O_RDWR mode and MY_WME were used in this code before the switch
was made to create_temp_file. The parameters are still there
so we just plug in the mode and WME so the underlying code will
create the temp file with the right mode. This only affected
Windows.
Adaption of the 5.1.6 build clone to the new "storage" directory layer,
already done in the general tree by Jani.
scripts/make_binary_distribution.sh:
Adaption of the 5.1.6 build clone to the new "storage" directory layer,
already done in the general tree by Jani:
2006/02/02 16:22:22+02:00 jani@ua141d10.elisa.omakaista.fi +2 -2
Fix to reflect change in directory structure.
into neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/extra/binlog_tests/ctype_cp932.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
Auto merged
mysql-test/extra/rpl_tests/rpl_stm_000001.test:
Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/rpl000017.result:
Auto merged
mysql-test/r/rpl_loaddata.result:
Auto merged
mysql-test/r/rpl_loaddata_s.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/rpl_stm_000001.result:
Auto merged
mysql-test/r/rpl_stm_flsh_tbls.result:
Auto merged
mysql-test/r/sp-prelocking.result:
Auto merged
mysql-test/r/type_bit.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/r/view_grant.result:
Auto merged
mysql-test/t/create_select_tmp.test:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl000017.test:
Auto merged
mysql-test/t/rpl_replicate_do.test:
Auto merged
mysql-test/t/sp-prelocking.test:
Auto merged
mysql-test/t/trigger-compat.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
mysql-test/r/rpl_loaddata_m.result:
Merge 5.0->5.1
mysql-test/t/rpl_failed_optimize.test:
Merge 5.0->5.1
mysql-test/t/rpl_insert_id.test:
Merge 5.0->5.1
mysql-test/t/rpl_loaddata.test:
Merge 5.0->5.1
mysql-test/t/rpl_loaddata_m.test:
Merge 5.0->5.1
mysql-test/t/rpl_loaddata_s.test:
Merge 5.0->5.1
mysql-test/t/rpl_multi_update3.test:
Merge 5.0->5.1
mysql-test/t/rpl_drop_temp.test:
Updated with work around stated by Tomas in bug 16552. NDB does not support temp tables.
mysql-test/r/rpl_drop_temp.result:
Updated with work around stated by Tomas in bug 16552. NDB does not support temp tables.
mysql-test/t/rpl_foreign_key_innodb-slave.opt:
Need to ensure that innodb table is created on the slave for this test
mysql-test/t/rpl_err_ignoredtable.test:
updated to run with ndb as default
mysql-test/r/rpl_err_ignoredtable.result:
updated to run with ndb as default
mysql-test/t/disabled.def:
Update requested by Lars
mysql-test/t/rpl_load_table_from_master.test:
Update requested by Lars
mysql-test/r/rpl_load_table_from_master.result:
Update requested by Lars
