1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-14185 CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only and InnoDB.

Browse Source 
handler::ha_create_handler_files shouldn't call the
mark_trx_read_write() for the temporary table.
This commit is contained in:
Alexey Botchkov 2018-04-07 21:51:15 +04:00
parent 6beb08c7b6
commit d6f3a0064b
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/read_only_innodb.result
View File

@ -221,6 +221,14 @@ a a
5 10 5 10
DROP TABLE temp1, temp2; DROP TABLE temp1, temp2;
# MDEV-14185 CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only and InnoDB.
CREATE TEMPORARY TABLE temp1 ENGINE=INNODB AS SELECT a FROM t1;
SELECT * FROM temp1;
a
1
DROP TABLE temp1;
# Disconnect and cleanup # Disconnect and cleanup
SET GLOBAL READ_ONLY = OFF; SET GLOBAL READ_ONLY = OFF;

9
mysql-test/t/read_only_innodb.test
View File

@ -243,6 +243,15 @@ UPDATE temp1,temp2 SET temp1.a = 5, temp2.a = 10;
SELECT * FROM temp1, temp2; SELECT * FROM temp1, temp2;
DROP TABLE temp1, temp2; DROP TABLE temp1, temp2;
--echo
--echo # MDEV-14185 CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only and InnoDB.
--echo
CREATE TEMPORARY TABLE temp1 ENGINE=INNODB AS SELECT a FROM t1;
SELECT * FROM temp1;
DROP TABLE temp1;
--echo --echo
--echo # Disconnect and cleanup --echo # Disconnect and cleanup
--echo --echo

3
sql/handler.cc
View File

@ -3770,7 +3770,8 @@ int
handler::ha_create_handler_files(const char *name, const char *old_name, handler::ha_create_handler_files(const char *name, const char *old_name,
int action_flag, HA_CREATE_INFO *info) int action_flag, HA_CREATE_INFO *info)
{ {
mark_trx_read_write(); if (!info || !(info->options & HA_LEX_CREATE_TMP_TABLE))
mark_trx_read_write();
return create_handler_files(name, old_name, action_flag, info); return create_handler_files(name, old_name, action_flag, info);
} }