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 | f174d5a2414e22b6cf452a2e8cbb6b72395a56dc (patch) | |
| tree | 1a687bd272d791651de5a4a1716efef6eebbe4b6 /scripts/mysql_fix_privilege_tables.sql | |
| parent | 44728324f0abe3e327fc2095a99e647b1c44dd8d (diff) | |
| parent | 05b709fc77e2f321fa3fa45ee5b2ec2ceae54055 (diff) | |
| download | mariadb-git-f174d5a2414e22b6cf452a2e8cbb6b72395a56dc.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 'scripts/mysql_fix_privilege_tables.sql')
| -rw-r--r-- | scripts/mysql_fix_privilege_tables.sql | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/mysql_fix_privilege_tables.sql b/scripts/mysql_fix_privilege_tables.sql index d4f095f5201..2b254799683 100644 --- a/scripts/mysql_fix_privilege_tables.sql +++ b/scripts/mysql_fix_privilege_tables.sql @@ -198,6 +198,11 @@ UPDATE user SET Create_routine_priv=Create_priv, Alter_routine_priv=Alter_priv w UPDATE db SET Create_routine_priv=Create_priv, Alter_routine_priv=Alter_priv, Execute_priv=Select_priv where user<>"" AND @hadCreateRoutinePriv = 0; # +# Add max_user_connections resource limit +# +ALTER TABLE user ADD max_user_connections int(11) unsigned DEFAULT '0' NOT NULL AFTER max_connections; + +# # Create some possible missing tables # CREATE TABLE IF NOT EXISTS procs_priv ( |