Archive uses native row format, so honestly this is just the change in a flag.
sql/ha_archive.h:
Added bit field support (and dropped the ha_not_exact_count since we always have this).
mysql-test/r/archive_bitfield.result:
New BitKeeper file ``mysql-test/r/archive_bitfield.result''
mysql-test/t/archive_bitfield.test:
New BitKeeper file ``mysql-test/t/archive_bitfield.test''
mysql-test/extra/rpl_tests/rpl_EE_err.test:
Splitting tests case per Lars review
mysql-test/t/rpl_EE_err.test:
Splitting tests case per Lars review
mysql-test/r/rpl_EE_err.result:
Splitting tests case per Lars review
mysql-test/t/rpl_stm_EE_err2.test:
New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test:
New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
mysql-test/r/rpl_stm_EE_err2.result:
New test case file from splitting out the test cases from the orginal rpl_EE_error.test per lars
BitKeeper/deleted/.del-rpl_row_EE_err.test~b3d8db3eacbb7af5:
Delete: mysql-test/extra/rpl_tests/rpl_row_EE_err.test
BitKeeper/deleted/.del-rpl_row_EE_err.test~6cd033708a4535db:
Delete: mysql-test/t/rpl_row_EE_err.test
BitKeeper/deleted/.del-rpl_row_EE_err.result~5ad217703f686c4d:
Delete: mysql-test/r/rpl_row_EE_err.result
- add a bit more debug messages
- disable events.test for now due to a bug
mysql-test/r/events.result:
fix result
mysql-test/t/disabled.def:
make it disabled
mysql-test/t/events.test:
disable show processlist
sql/event_executor.cc:
a bit more debug messages
mysql-test/t/ndb_dd_basic.test:
Changed test.t1 back to t1 per Jonas's review
mysql-test/r/ndb_dd_basic.result:
Changed test.t1 back to t1 per Jonas's review
- various fixes of test cases
(hopefully the last pre-push update before the push)
mysql-test/include/system_db_struct.inc:
extend test case to include testing for event system table
mysql-test/r/events.result:
results of events test
mysql-test/r/system_mysql_db.result:
more testing - add structure of event system table
mysql-test/t/events.test:
test case for events (internal CRON)
mysql-test/t/system_mysql_db_fix.test:
drop event table and leave the test database empty
scripts/mysql_create_system_tables.sh:
add missing create table statement
scripts/mysql_fix_privilege_tables.sql:
don't specify the database. this fixes a failing test case which creates the
tables not on mysql but on a test database and then tests again mysql.
sql/event_executor.cc:
if asked to stop -> stop.
mysql-test/t/ndb_dd_basic.test:
Rename: mysql-test/t/ndb_basic_disk.test -> mysql-test/t/ndb_dd_basic.test
mysql-test/r/ndb_dd_basic.result:
Rename: mysql-test/r/ndb_basic_disk.result -> mysql-test/r/ndb_dd_basic.result
mysql-test/t/ndb_dd_ddl.test:
New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
mysql-test/r/ndb_dd_ddl.result:
New Disk Data DDL Test case. Formally know as ndb_dd_dupcase.test
after another merge fixes.
mysql-test/r/information_schema.result:
WL #1034 (Internal CRON)
fix result
mysql-test/r/mysqlcheck.result:
WL #1034 (Internal CRON)
fix result
mysql-test/r/sp.result:
WL #1034 (Internal CRON)
fix result
sql/event.cc:
after fixes for WL1012 fix these to be able to compile
sql/event_timed.cc:
after fixes for WL1012 fix these to be able to compile
sql/share/errmsg.txt:
readd error messages removed during manual update
sql/sql_yacc.yy:
fix sql_yacc.yy for WL#1034 (Internal CRON) after the manual
merge. The merge wasn't good :(
mysql-test/extra/binlog_tests/ctype_cp932.test:
fixed test case
mysql-test/r/binlog_stm_ctype_cp932.result:
fixed test result
mysql-test/t/ctype_ucs.test:
fixed test case
sql/sql_show.cc:
Compilation with disabled partitioning is fixed
client/mysqltest.c:
Remove lineno_stack, instead use the already existing file_stack and add a new variable lineno to keep track of what line in the file we are at.
mysql-test/r/mysqltest.result:
Correct test result, "At line 1" should be printed
Checking that binlog is open before calling binlog_query().
mysql-test/r/rpl_row_basic_11bugs.result:
Result change caused by test change.
mysql-test/t/rpl_row_basic_11bugs.test:
Ignoring format event since it contain the version number.
sql/sql_insert.cc:
Debriding code.
Checking that binlog is open before calling binlog_query().
mysql-test/r/archive.result:
New Result file.
mysql-test/t/archive.test:
New tests. Modifies old style 0 to NULL.
sql/ha_archive.cc:
Added support for scanning non unique indexes. Added support for the AUTO_INCREMENT bit for CREATE TABLE
sql/ha_archive.h:
Added variables for continueing scans of index_next
client/mysqltest.c:
Disable "let" assign each column of query to own var
mysql-test/r/mysqltest.result:
Remove test results for disabled test
mysql-test/t/mysqltest.test:
Disable test for "let assigns each column of query to own var"
merge before push
BUILD/SETUP.sh:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
sql/Makefile.am:
Auto merged
sql/lex.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp.h:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_acl.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
sql/tztime.cc:
Auto merged
libmysqld/Makefile.am:
manual merge
mysql-test/r/information_schema.result:
manual merge
sql/share/errmsg.txt:
manual merge
sql/sp_head.cc:
manual merge
sql/sql_lex.h:
manual merge
sql/sql_yacc.yy:
manual merge
- fixed test results
- fixed bug caught by information_schema.test . Bison temporal
variables are very nice but extremely error-prone (Count one more
time just to be sure).
mysql-test/r/connect.result:
fix result for WL#1034 (internal CRON)
mysql-test/r/events.result:
fix result for WL#1034 (internal CRON)
mysql-test/r/grant.result:
fix result for WL#1034 (internal CRON)
mysql-test/r/information_schema.result:
fix result for WL#1034 (internal CRON)
mysql-test/r/lowercase_table_grant.result:
fix result for WL#1034 (internal CRON)
mysql-test/r/ps.result:
fix result for WL#1034 (internal CRON)
mysql-test/r/system_mysql_db.result:
fix result for WL#1034 (internal CRON)
mysql-test/t/events.test:
fix result for WL#1034 (internal CRON)
sql/sql_yacc.yy:
- fix bug introduced by me when making usage of temporal
bison variables. COUNT 7 times then write!
There is a specific rpl_ignore_grant test case for GRANT.
mysql-test/r/rpl_ignore_revoke.result:
New BitKeeper file ``mysql-test/r/rpl_ignore_revoke.result''
mysql-test/t/rpl_ignore_revoke-slave.opt:
New BitKeeper file ``mysql-test/t/rpl_ignore_revoke-slave.opt''
mysql-test/t/rpl_ignore_revoke.test:
New BitKeeper file ``mysql-test/t/rpl_ignore_revoke.test''
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
client/mysqltest.c:
Auto merged
config/ac-macros/yassl.m4:
Auto merged
include/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/t/mysqltest.test:
Auto merged
sql/sql_acl.cc:
Auto merged
into neptunus.(none):/home/msvensson/mysql/wl2930/my51-wl2930-integration
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqlslap.result:
Real output produced, remove "echo"
mysql-test/t/mysqlslap.test:
Real output produced, remove "echo"
mysql-test/r/archive.result:
New result file.
mysql-test/t/archive.test:
Added new tests for indexes. Also accidently updated it so that all "FROM" are now capitalized :)
sql/ha_archive.cc:
Changed comparision function to compare memory locations.
Modified function for storing the auto_increment.
Removed useless DBUG_PRINT
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/mysqltest.test:
Changed to "test ! -e" instead of "test -s"
