Commit cbee58e3 authored by unknown's avatar unknown
Browse files

Merge polly.local:/tmp/maint/bug22077/my50-bug22077 

into  polly.local:/tmp/maint/bug22077/my51-bug22077


mysql-test/t/read_only.test:
  Auto merged
sql/sql_parse.cc:
  Manual merge
parents 266bf339 2b720487

mysql-test/r/read_only.result

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,11 @@ delete t1 from t1,t3 where t1.a=t3.a; 
drop table t1;

insert into t1 values(1);

ERROR HY000: The MySQL server is running with the --read-only option so it cannot execute this statement

drop temporary table ttt;

ERROR 42S02: Unknown table 'ttt'

drop temporary table if exists ttt;

Warnings:

Note	1051	Unknown table 'ttt'

drop table t1,t2;

drop user test@localhost;

set global read_only=0;

mysql-test/t/read_only.test

+12 −0
Original line number Diff line number Diff line
@@ -101,6 +101,18 @@ drop table t1; 
--error 1290

insert into t1 values(1);



#

# BUG #22077 "DROP TEMPORARY TABLE fails with wrong error if read_only is set"

#

# check if DROP TEMPORARY on a non-existing temporary table returns the right

# error



--error ER_BAD_TABLE_ERROR

drop temporary table ttt;



# check if DROP TEMPORARY TABLE IF EXISTS produces a warning with read_only set

drop temporary table if exists ttt;



connection default;

drop table t1,t2;

drop user test@localhost;

sql/sql_parse.cc

+5 −4
Original line number Diff line number Diff line
@@ -2566,6 +2566,7 @@ mysql_execute_command(THD *thd) 
	(sql_command_flags[lex->sql_command] & CF_CHANGES_DATA) &&

        !((lex->sql_command == SQLCOM_CREATE_TABLE) &&

          (lex->create_info.options & HA_LEX_CREATE_TMP_TABLE)) &&

        !((lex->sql_command == SQLCOM_DROP_TABLE) && lex->drop_temporary) &&

        ((lex->sql_command != SQLCOM_UPDATE_MULTI) &&

          some_non_temp_table_to_be_updated(thd, all_tables)))

    {