diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-09-22 10:59:33 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-09-22 10:59:33 +0300 |
| commit | 6546f36e2d8378f224114b88cae3806684990162 (patch) | |
| tree | 9bdcec4c2cce4db72873b8d790dc4c3c011c5f0f /tests | |
| parent | cc71ac185d1dcef30a964b5f0b98ef4ebce263d1 (diff) | |
| parent | 0e88d440d689cb8805bab3a7bcca274e0aa5c975 (diff) | |
| download | mariadb-git-6546f36e2d8378f224114b88cae3806684990162.tar.gz | |
Merge with 3.23.53
Docs/manual.texi:
Auto merged
sql/lock.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
tests/grant.pl:
Auto merged
sql/sql_acl.cc:
Merge with 3.23.53 (fixes problem with critical region in GRANT)
sql/sql_insert.cc:
Merge with 3.23.53 (no changes)
sql/sql_parse.cc:
Merge with 3.23.53 (no changes)
sql/sql_udf.cc:
Merge with 3.23.53 (indent change)
sql/table.h:
Merge with 3.23.53 (no changes)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/grant.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/grant.pl b/tests/grant.pl index 6da4326d465..1cd72af48fe 100644 --- a/tests/grant.pl +++ b/tests/grant.pl @@ -304,7 +304,7 @@ safe_query("revoke GRANT OPTION on $opt_database.test from $user",1); # safe_query("grant select(a) on $opt_database.test to $user"); -user_query("show columns from test"); +user_query("show full columns from test"); safe_query("grant insert (b), update (b) on $opt_database.test to $user"); user_query("select count(a) from test"); |