summaryrefslogtreecommitdiff
path: root/sql/lex.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-04-28 19:56:10 +0300
committerMichael Widenius <monty@askmonty.org>2011-04-28 19:56:10 +0300
commit2721e912ba45f42f3ddf7c8366f6abbeef060833 (patch)
tree80c1fc27d71fa58e963c729657e383cf4b4d2c86 /sql/lex.h
parent6da8ac5f71a6501cb0fb1304ff144ec41b4d9389 (diff)
downloadmariadb-git-2721e912ba45f42f3ddf7c8366f6abbeef060833.tar.gz
Added ALTER ONLINE TABLE, which will give an error if the change can't be done 'instantly' (without a table copy)
mysql-test/r/alter_table_online.result: Test new feature mysql-test/t/alter_table_online.test: Test new feature sql/handler.cc: Added comment sql/lex.h: Added ONLINE keyword sql/mysql_priv.h: Added option to alter table to require online operation sql/share/errmsg.txt: Added error message if ONLINE can't be done sql/sql_lex.h: Added online option sql/sql_parse.cc: Added online option to mysql_alter_table() sql/sql_table.cc: Added test that gives error if table can't be done instantly when requsted to be online. Fixed wrong test if table includes a VARCHAR Fixed wrong (but unlikely) handling of error conditions in ALTER table sql/sql_yacc.yy: Added ALTER ONLINE TABLE syntax storage/maria/ha_maria.cc: Fixed bug where 'start_bulk_insert' used too small buffer if used with unknown number of rows
Diffstat (limited to 'sql/lex.h')
-rw-r--r--sql/lex.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h
index 057b7d1ce96..e763b0325ea 100644
--- a/sql/lex.h
+++ b/sql/lex.h
@@ -378,6 +378,7 @@ static SYMBOL symbols[] = {
{ "ON", SYM(ON)},
{ "ONE", SYM(ONE_SYM)},
{ "ONE_SHOT", SYM(ONE_SHOT_SYM)},
+ { "ONLINE", SYM(ONLINE_SYM)},
{ "OPEN", SYM(OPEN_SYM)},
{ "OPTIMIZE", SYM(OPTIMIZE)},
{ "OPTIONS", SYM(OPTIONS_SYM)},