From 85d8d30a55b1dd7f1bc876b47ee6b6a53d7d9964 Mon Sep 17 00:00:00 2001 From: Vesa Pentti Date: Sun, 7 Jan 2018 19:14:27 +0000 Subject: MDEV-14185 -- CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only and InnoDB * Did affect only transactional engines like InnoDB * Note: During table creation handler's 'table_share' is NULL * Now the transaction isn't marked rw for a temporary table when it's created --- mysql-test/t/create_select_temporary_table.test | 23 +++++++++++++++++++++++ sql/handler.cc | 13 +++++++++---- sql/handler.h | 2 +- sql/unireg.cc | 3 ++- 4 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 mysql-test/t/create_select_temporary_table.test diff --git a/mysql-test/t/create_select_temporary_table.test b/mysql-test/t/create_select_temporary_table.test new file mode 100644 index 00000000000..d5dea48f43c --- /dev/null +++ b/mysql-test/t/create_select_temporary_table.test @@ -0,0 +1,23 @@ +--source include/have_innodb.inc + +SET GLOBAL read_only = on; +CREATE DATABASE mydb; +use mydb; +CREATE TABLE mytable (id INTEGER) ENGINE=InnoDB; +INSERT INTO mytable (id) VALUES (1); + +CREATE USER 'nosuper'@'localhost'; +GRANT SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, CREATE TEMPORARY TABLES, LOCK TABLES ON mydb.* TO 'nosuper'@'localhost'; + +--connect (con1,localhost,nosuper,,mydb) + +CREATE TEMPORARY TABLE t1 ENGINE=InnoDB AS SELECT id FROM mytable; + +# Cleanup + +--disconnect con1 +--connection default +DROP DATABASE mydb; +DROP USER nosuper@localhost; +SET GLOBAL read_only = DEFAULT; + diff --git a/sql/handler.cc b/sql/handler.cc index a5a28ceb777..4de20bca00e 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3989,7 +3989,8 @@ handler::mark_trx_read_write() DBUG_ASSERT(has_transactions()); /* table_share can be NULL in ha_delete_table(). See implementation - of standalone function ha_delete_table() in sql_base.cc. + of standalone function ha_delete_table() in sql_base.cc. It can + also be NULL during table creation. */ if (table_share == NULL || table_share->tmp_table == NO_TMP_TABLE) ha_info->set_trx_read_write(); @@ -4374,7 +4375,8 @@ handler::ha_create(const char *name, TABLE *form, HA_CREATE_INFO *info_arg) int handler::ha_create_partitioning_metadata(const char *name, const char *old_name, - int action_flag) + int action_flag, + bool should_mark_rw) { /* Normally this is done when unlocked, but in fast_alter_partition_table, @@ -4382,8 +4384,11 @@ handler::ha_create_partitioning_metadata(const char *name, partitions. */ DBUG_ASSERT(m_lock_type == F_UNLCK || - (!old_name && strcmp(name, table_share->path.str))); - mark_trx_read_write(); + (!old_name && table_share && strcmp(name, table_share->path.str))); + if (should_mark_rw) + { + mark_trx_read_write(); + } return create_partitioning_metadata(name, old_name, action_flag); } diff --git a/sql/handler.h b/sql/handler.h index 68de7563d8b..1734ac0c598 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -2872,7 +2872,7 @@ public: int ha_create(const char *name, TABLE *form, HA_CREATE_INFO *info); int ha_create_partitioning_metadata(const char *name, const char *old_name, - int action_flag); + int action_flag, bool should_mark_rw = true); int ha_change_partitions(HA_CREATE_INFO *create_info, const char *path, diff --git a/sql/unireg.cc b/sql/unireg.cc index 66959f400d9..1a8824fd720 100644 --- a/sql/unireg.cc +++ b/sql/unireg.cc @@ -386,7 +386,8 @@ int rea_create_table(THD *thd, LEX_CUSTRING *frm, if (thd->variables.keep_files_on_create) create_info->options|= HA_CREATE_KEEP_FILES; - if (file->ha_create_partitioning_metadata(path, NULL, CHF_CREATE_FLAG)) + if (file->ha_create_partitioning_metadata(path, NULL, + CHF_CREATE_FLAG, !create_info->tmp_table())) goto err_part; if (!no_ha_create_table) -- cgit v1.2.1