diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-08-08 16:41:04 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-08-08 16:41:04 +0300 |
| commit | 028cfaba9ba0fcbba30511e6951daab6a1829f20 (patch) | |
| tree | 8abd660ca8962e8c1a9aa58dbabd22e3c2e6f163 /sql/lex.h | |
| parent | 267b80834ad524c0d72976bc71e5b5bc9815ea1a (diff) | |
| download | mariadb-git-028cfaba9ba0fcbba30511e6951daab6a1829f20.tar.gz | |
Fix after merge
Updated WEEK() and DATE information in the manual.
Docs/manual.texi:
Updated WEEK() information.
Added more information of how MySQL stores dates.
libmysql/Makefile.am:
Fix after merge
libmysqld/lib_vio.c:
Use new vio_blocking()
mysql-test/r/group_by.result:
Update results after merge
sql/ha_innodb.cc:
Fix after merge
sql/lex.h:
Fix after merge
sql/slave.cc:
Added missing include file
sql/sql_base.cc:
Added function comments
vio/test-ssl.c:
Fix after merge
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/lex.h b/sql/lex.h index 1f7a121e262..c1d647c47aa 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -251,7 +251,6 @@ static SYMBOL symbols[] = { { "NEW", SYM(NEW_SYM),0,0}, { "NCHAR", SYM(NCHAR_SYM),0,0}, { "NO", SYM(NO_SYM),0,0}, - { "FOREIGN_KEY_CHECKS", SYM(FOREIGN_KEY_CHECKS), 0, 0}, { "NOT", SYM(NOT),0,0}, { "NULL", SYM(NULL_SYM),0,0}, { "NUMERIC", SYM(NUMERIC_SYM),0,0}, @@ -285,7 +284,6 @@ static SYMBOL symbols[] = { { "RELAY_LOG_POS", SYM(RELAY_LOG_POS_SYM),0,0}, { "RELOAD", SYM(RELOAD),0,0}, { "REGEXP", SYM(REGEXP),0,0}, - { "UNIQUE_CHECKS", SYM(UNIQUE_CHECKS), 0, 0}, { "RENAME", SYM(RENAME),0,0}, { "REPAIR", SYM(REPAIR),0,0}, { "REPLACE", SYM(REPLACE),0,0}, |