merge with 3.23 to get:

- Fix for empty table/column names


mysql-test/t/create.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/grant.pl:
  Auto merged
sql/filesort.cc:
  merge with 3.23
sql/sql_table.cc:
  merge with 3.23
tests/grant.res:
  merge with 3.23

1 files changed, 10 insertions, 0 deletions

diff --git a/tests/grant.pl b/tests/grant.pl
index ba95d78d068..5a24127d79d 100644
--- a/tests/grant.pl
+++ b/tests/grant.pl
@@ -210,6 +210,16 @@ user_query("delete from $opt_database.test where a=1",1);
 user_query("update $opt_database.test set b=3 where b=1",1);
 user_query("update $opt_database.test set b=b+1",1);
 
+#
+# Test global SELECT privilege combined with table level privileges
+#
+
+safe_query("grant SELECT on *.* to $user");
+user_connect(0);
+user_query("update $opt_database.test set b=b+1");
+safe_query("revoke SELECT on *.* from $user");
+user_connect(0);
+
 # Add one privilege at a time until the user has all privileges
 user_query("select * from test",1);
 safe_query("grant select on $opt_database.test to $user");