diff options
| author | unknown <monty@mashka.mysql.fi> | 2004-02-22 08:54:06 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2004-02-22 08:54:06 +0200 |
| commit | 522e83b64ab46d400ccb6aa8d7b749eefc28f4d5 (patch) | |
| tree | b777dec20e1471d6d54fde4ab98077b3aaa26c08 /sql/sql_yacc.yy | |
| parent | f312a516cc34cbb635f56d3f116682b1297b8559 (diff) | |
| download | mariadb-git-522e83b64ab46d400ccb6aa8d7b749eefc28f4d5.tar.gz | |
Cleanups
acinclude.m4:
Remove innobase/libodbc
innobase/Makefile.am:
Remove innobase/libodbc
sql/sql_delete.cc:
Indentation cleanup
sql/sql_yacc.yy:
Fixed wrong merge
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 27217f24cde..5add9199ad4 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -3364,7 +3364,6 @@ keyword: | MASTER_PASSWORD_SYM {} | MASTER_SERVER_ID_SYM {} | MASTER_CONNECT_RETRY_SYM {} - | MASTER_SERVER_ID_SYM {} | MAX_CONNECTIONS_PER_HOUR {} | MAX_QUERIES_PER_HOUR {} | MAX_UPDATES_PER_HOUR {} |