summaryrefslogtreecommitdiff
path: root/sql/sql_table.cc
diff options
context:
space:
mode:
authorunknown <vva@eagle.mysql.r18.ru>2004-03-27 02:29:31 +0400
committerunknown <vva@eagle.mysql.r18.ru>2004-03-27 02:29:31 +0400
commit67e4f431d6787cdc4f634b3a73d0b8cab0a06a90 (patch)
tree1c5e253563e466214850e1257016a6fabab0a821 /sql/sql_table.cc
parente320ade2efe0d91749dc3ebb812c8c1ded799499 (diff)
downloadmariadb-git-67e4f431d6787cdc4f634b3a73d0b8cab0a06a90.tar.gz
fixed bug #2342
"Running ANALYZE TABLE on bdb table inside a transaction hangs server thread" mysql-test/r/bdb-crash.result: added test for bug #2342 "Running ANALYZE TABLE on bdb table inside a transaction hangs server thread" mysql-test/t/bdb-crash.test: added test for bug #2342 "Running ANALYZE TABLE on bdb table inside a transaction hangs server thread" sql/handler.h: added constant HA_ADMIN_REJECT sql/sql_table.cc: added processing of HA_ADMIN_REJECT in ha_berkley::analyze
Diffstat (limited to 'sql/sql_table.cc')
-rw-r--r--sql/sql_table.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index be3615c71ce..48007b44f43 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1666,6 +1666,12 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
protocol->store("Operation failed",16, system_charset_info);
break;
+ case HA_ADMIN_REJECT:
+ protocol->store("status", 6, system_charset_info);
+ protocol->store("Operation need committed state",30, system_charset_info);
+ open_for_modify= false;
+ break;
+
case HA_ADMIN_ALREADY_DONE:
protocol->store("status", 6, system_charset_info);
protocol->store("Table is already up to date", 27, system_charset_info);