diff options
| author | unknown <dlenev@mysql.com> | 2004-12-31 12:48:27 +0300 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2004-12-31 12:48:27 +0300 |
| commit | efe5d60e89ea5d3d33a3faa6ab2226b34fec5004 (patch) | |
| tree | b2dc794e496d771c0d543173e597da11418984ca /sql/lex.h | |
| parent | 15f8439905586ab5c126ac633abd04b2619b2591 (diff) | |
| parent | 23517e1638563ea4264dbfbe213a0008f6895893 (diff) | |
| download | mariadb-git-efe5d60e89ea5d3d33a3faa6ab2226b34fec5004.tar.gz | |
Manual merge.
client/mysqltest.c:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
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 a1078512b87..56d824b7bb8 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)}, |