Merge 10.4 into 10.5

MariaDB · Oct 12, 2022 · 977c385 · 977c385
2 parents fa0cada + 2aab7f2
commit 977c385
Show file tree

Hide file tree

Showing 46 changed files with 2,936 additions and 364 deletions.
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
@@ -1722,7 +1722,7 @@ that may lead to an endless loop.",
  &opt_binlog_rows_event_max_encoded_size, 0,
  GET_ULONG, REQUIRED_ARG, UINT_MAX/4, 256, ULONG_MAX, 0, 256, 0},
 #endif
- {"verify-binlog-checksum", 'c', "Verify checksum binlog events.",
+ {"verify-binlog-checksum", 'c', "Verify binlog event checksums.",
  (uchar**) &opt_verify_binlog_checksum, (uchar**) &opt_verify_binlog_checksum,
  0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
  {"rewrite-db", OPT_REWRITE_DB,

diff --git a/config.h.cmake b/config.h.cmake
@@ -255,9 +255,6 @@
 #cmakedefine STRUCT_TIMESPEC_HAS_TV_SEC 1
 #cmakedefine STRUCT_TIMESPEC_HAS_TV_NSEC 1
 
-#define USE_MB 1
-#define USE_MB_IDENT 1
-
 /* this means that valgrind headers and macros are available */
 #cmakedefine HAVE_VALGRIND_MEMCHECK_H 1
 
@@ -453,8 +450,8 @@
 #cmakedefine MYSQL_DEFAULT_CHARSET_NAME "@MYSQL_DEFAULT_CHARSET_NAME@"
 #cmakedefine MYSQL_DEFAULT_COLLATION_NAME "@MYSQL_DEFAULT_COLLATION_NAME@"
 
-#cmakedefine USE_MB 1
-#cmakedefine USE_MB_IDENT 1
+#cmakedefine USE_MB
+#cmakedefine USE_MB_IDENT
 
 /* This should mean case insensitive file system */
 #cmakedefine FN_NO_CASE_SENSE 1

diff --git a/mysql-test/main/grant3.result b/mysql-test/main/grant3.result
@@ -195,4 +195,29 @@ connection default;
 DROP USER 'user2'@'%';
 DROP DATABASE temp;
 set global sql_mode=default;
-End of 5.0 tests
+#
+# End of 5.0 tests
+#
+create database db1;
+create user foo@localhost;
+grant create on db1.* to foo@localhost;
+connect foo,localhost,foo;
+create temporary table t as values (1),(2),(3);
+use db1;
+create table t1 as select * from test.t;
+ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table `db1`.`t1`
+create table t1 as values (1),(2),(3);
+ERROR 42000: INSERT command denied to user 'foo'@'localhost' for table `db1`.`t1`
+create table t1 (a int);
+disconnect foo;
+connection default;
+revoke create on db1.* from foo@localhost;
+grant insert on db1.* to foo@localhost;
+connect foo,localhost,foo;
+use db1;
+create table t2 as values (1),(2),(3);
+ERROR 42000: CREATE command denied to user 'foo'@'localhost' for table `db1`.`t2`
+disconnect foo;
+connection default;
+drop user foo@localhost;
+drop database db1;
diff --git a/mysql-test/main/grant3.test b/mysql-test/main/grant3.test
@@ -207,7 +207,35 @@ DROP USER 'user2'@'%';
 DROP DATABASE temp;
 
 set global sql_mode=default;
---echo End of 5.0 tests
+--echo #
+--echo # End of 5.0 tests
+--echo #
+
+create database db1;
+create user foo@localhost;
+grant create on db1.* to foo@localhost;
+connect foo,localhost,foo;
+create temporary table t as values (1),(2),(3);
+use db1;
+--error ER_TABLEACCESS_DENIED_ERROR
+create table t1 as select * from test.t;
+--error ER_TABLEACCESS_DENIED_ERROR
+create table t1 as values (1),(2),(3);
+create table t1 (a int);
+disconnect foo;
+connection default;
+
+revoke create on db1.* from foo@localhost;
+grant insert on db1.* to foo@localhost;
+connect foo,localhost,foo;
+use db1;
+--error ER_TABLEACCESS_DENIED_ERROR
+create table t2 as values (1),(2),(3);
+disconnect foo;
+
+connection default;
+drop user foo@localhost;
+drop database db1;
 
 # Wait till we reached the initial number of concurrent sessions
 --source include/wait_until_count_sessions.inc