diff options
| author | unknown <monty@mysql.com> | 2006-05-05 20:08:40 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-05-05 20:08:40 +0300 |
| commit | 3995b06b40290cc836098fed18b2299efea1d652 (patch) | |
| tree | d106da477f33eec83b9b2457a6a1f6c03d5855bb /sql/handler.cc | |
| parent | d1b6779adef729bafc9a105466a237488ee8cce1 (diff) | |
| download | mariadb-git-3995b06b40290cc836098fed18b2299efea1d652.tar.gz | |
Don't use row level logging on optimize or repair table.
(Fixes core dump in rpl_failed_optimize.test)
Ensure we end active transcations if we do an admin command (like optimize, repair etc)
mysql-test/extra/rpl_tests/rpl_failed_optimize.test:
Added extra test + drop of table at end of test
mysql-test/lib/mtr_report.pl:
Fail if mysqld asserts or prints stack
mysql-test/mysql-test-run.sh:
Fail if mysqld asserts or prints stack
mysql-test/r/exampledb.result:
Cleanup of events_tests (as this caused a lot of problems if it didn't work)
mysql-test/r/innodb.result:
Extra test to see that we can do an optimize table on an active transaction
mysql-test/r/rpl_failed_optimize.result:
Added extra test + drop of table at end of test
mysql-test/t/exampledb.test:
Cleanup of events_tests (as this caused a lot of problems if it didn't work)
mysql-test/t/innodb.test:
Extra test to see that we can do an optimize table on an active transaction
sql/handler.cc:
Don't use row level logging on optimize or repair table.
sql/log.cc:
Simplify code (no logic changes)
sql/mysql_priv.h:
Added prototype
sql/sql_base.cc:
Better name for define
sql/sql_class.cc:
Indentation fix
sql/sql_parse.cc:
Make end_active_trans() global
sql/sql_table.cc:
Ensure we end active transcations if we do an admin command (like optimize, repair etc)
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 483bf049177..b9ef05a33c2 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3264,10 +3264,11 @@ int handler::ha_external_lock(THD *thd, int lock_type) locking combined with row-based replication needs to be looked over. Ideally, no such special handling should be needed. */ - switch (thd->lex->sql_command) - { + switch (thd->lex->sql_command) { case SQLCOM_TRUNCATE: case SQLCOM_ALTER_TABLE: + case SQLCOM_OPTIMIZE: + case SQLCOM_REPAIR: DBUG_RETURN(0); default: break; |