database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge with 4.0 to get lastest bug fixes

Browse Source 
include/m_string.h:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/r/bdb-crash.result:
  Auto merged
sql/handler.h:
  Auto merged
mysql-test/r/grant_cache.result:
  Auto merged
mysql-test/t/grant_cache.test:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
innobase/mem/mem0dbg.c:
  Merge with 4.0
mysql-test/r/myisam.result:
  Merge with 4.0
mysql-test/r/order_by.result:
  Merge with 4.0
mysql-test/t/bdb-crash.test:
  Merge with 4.0
mysql-test/t/myisam.test:
  Merge with 4.0
mysql-test/t/order_by.test:
  Merge with 4.0
sql/ha_berkeley.cc:
  Merge with 4.0 (use local code)
sql/sql_select.cc:
  Merge with 4.0 to get fix for FORCE INDEX ... ORDER BY
This commit is contained in:
unknown
2004-03-29 19:21:53 +03:00
parent 883215956e 501c3e7a0e
commit ff908d18a2
14 changed files with 165 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_table.cc
View File

@@ -1672,6 +1672,12 @@ static int mysql_admin_table(THD* thd, TABLE_LIST* tables,
open_for_modify= false;
break;
case HA_ADMIN_REJECT:
net_store_data(packet,"status");
net_store_data(packet,"Operation need committed state");
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);