diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-10-01 13:15:29 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-01 13:15:29 +0200 |
commit | 416d0aebbfaaa00802d00105a0bd2faedb8b8f04 (patch) | |
tree | 5244b83a9f22d4d5899154c9a64a316111bbe6b6 /sql/lex.h | |
parent | adf6e145f77d2f7b049b977ee55ed12d05b96eac (diff) | |
download | mariadb-git-416d0aebbfaaa00802d00105a0bd2faedb8b8f04.tar.gz |
more fixes for test cases
mysql-test/suite/innodb/include/restart_and_reinit.inc:
drop and recreate mysql.innodb* tables when deleting innodb table spaces
mysql-test/t/ssl_8k_key-master.opt:
with loose- prefix ssl errors are ignored
sql-common/client.c:
compiler warnings
sql/field.cc:
use the new function
sql/item.cc:
don't convert time to double or decimal via longlong,
this loses sub-second part.
Use dedicated functions.
sql/item.h:
incorrect cast_to_int type for params
sql/item_strfunc.cc:
use the new function
sql/lex.h:
unused
sql/my_decimal.h:
helper macro
sql/sql_plugin.cc:
workaround for a compiler warning
sql/sql_yacc.yy:
unused
sql/transaction.cc:
fix the merge for SERVER_STATUS_IN_TRANS_READONLY protocol flag
storage/sphinx/CMakeLists.txt:
compiler warnings
Diffstat (limited to 'sql/lex.h')
-rw-r--r-- | sql/lex.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/lex.h b/sql/lex.h index 6587f5b8a9c..9756d5bc7cc 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -400,7 +400,6 @@ static SYMBOL symbols[] = { { "OLD_PASSWORD", SYM(OLD_PASSWORD)}, { "ON", SYM(ON)}, { "ONE", SYM(ONE_SYM)}, - { "ONE_SHOT", SYM(ONE_SHOT_SYM)}, { "ONLINE", SYM(ONLINE_SYM)}, { "ONLY", SYM(ONLY_SYM)}, { "OPEN", SYM(OPEN_SYM)}, |