diff options
| author | unknown <dlenev@mysql.com> | 2004-12-29 22:35:16 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-12-29 22:35:16 +0300 |
| commit | c5eef52af727eb87875c31c275e95bea39dc9d32 (patch) | |
| tree | 1a687bd272d791651de5a4a1716efef6eebbe4b6 /sql/lex.h | |
| parent | a75f125ee2f6846dd06290a21514a6b0633592ed (diff) | |
| parent | db11338e57d614e71e716d9e655a1bb8033ffa99 (diff) | |
| download | mariadb-git-c5eef52af727eb87875c31c275e95bea39dc9d32.tar.gz | |
Manual merge of patch implementing WL#1339 with main tree.
client/mysqltest.c:
Auto merged
mysql-test/r/system_mysql_db.result:
Auto merged
sql/lex.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
mysql-test/r/grant.result:
Manual merge
scripts/mysql_create_system_tables.sh:
Manual merge
scripts/mysql_fix_privilege_tables.sql:
Manual merge
sql/mysql_priv.h:
Manual merge
sql/mysqld.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'sql/lex.h')
| -rw-r--r-- | sql/lex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/lex.h b/sql/lex.h index 5b6c86bf0ed..8e7902c54e3 100644 --- a/sql/lex.h +++ b/sql/lex.h @@ -304,6 +304,7 @@ static SYMBOL symbols[] = { { "MAX_QUERIES_PER_HOUR", SYM(MAX_QUERIES_PER_HOUR)}, { "MAX_ROWS", SYM(MAX_ROWS)}, { "MAX_UPDATES_PER_HOUR", SYM(MAX_UPDATES_PER_HOUR)}, + { "MAX_USER_CONNECTIONS", SYM(MAX_USER_CONNECTIONS_SYM)}, { "MEDIUM", SYM(MEDIUM_SYM)}, { "MEDIUMBLOB", SYM(MEDIUMBLOB)}, { "MEDIUMINT", SYM(MEDIUMINT)}, |