mirror of
https://github.com/MariaDB/server.git
synced 2025-10-30 04:26:45 +03:00
Merge kpdesk.mysql.com:/home/thek/dev/bug22043/my51-bug22043
into kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint sql/sql_parse.cc: Auto merged
This commit is contained in:
@@ -468,4 +468,24 @@ drop table t1;
|
||||
set global log_bin_trust_function_creators=0;
|
||||
set global log_bin_trust_function_creators=0;
|
||||
End of 5.0 tests
|
||||
drop database if exists mysqltest;
|
||||
drop database if exists mysqltest2;
|
||||
create database mysqltest;
|
||||
create database mysqltest2;
|
||||
use mysqltest2;
|
||||
create table t ( t integer );
|
||||
create procedure mysqltest.test() begin end;
|
||||
insert into t values ( 1 );
|
||||
show binlog events in 'master-bin.000001' from 8657;
|
||||
Log_name Pos Event_type Server_id End_log_pos Info
|
||||
master-bin.000001 8657 Query 1 8760 drop database if exists mysqltest2
|
||||
master-bin.000001 8760 Query 1 8853 create database mysqltest
|
||||
master-bin.000001 8853 Query 1 8948 create database mysqltest2
|
||||
master-bin.000001 8948 Query 1 9045 use `mysqltest2`; create table t ( t integer )
|
||||
master-bin.000001 9045 Query 1 9184 use `mysqltest2`; CREATE DEFINER=`root`@`localhost` procedure mysqltest.test() begin end
|
||||
master-bin.000001 9184 Query 1 9279 use `mysqltest2`; insert into t values ( 1 )
|
||||
create procedure `\\`.test() begin end;
|
||||
ERROR 42000: Unknown database '\\'
|
||||
drop database mysqltest;
|
||||
drop database mysqltest2;
|
||||
End of 5.1 tests
|
||||
|
||||
@@ -528,4 +528,26 @@ connection master;
|
||||
set global log_bin_trust_function_creators=0;
|
||||
--echo End of 5.0 tests
|
||||
|
||||
#
|
||||
# Bug22043: MySQL don't add "USE <DATABASE>" before "DROP PROCEDURE IF EXISTS"
|
||||
#
|
||||
connection master;
|
||||
--disable_warnings
|
||||
drop database if exists mysqltest;
|
||||
drop database if exists mysqltest2;
|
||||
--enable_warnings
|
||||
create database mysqltest;
|
||||
create database mysqltest2;
|
||||
use mysqltest2;
|
||||
create table t ( t integer );
|
||||
create procedure mysqltest.test() begin end;
|
||||
insert into t values ( 1 );
|
||||
show binlog events in 'master-bin.000001' from 8657;
|
||||
--error ER_BAD_DB_ERROR
|
||||
create procedure `\\`.test() begin end;
|
||||
# Clean up
|
||||
drop database mysqltest;
|
||||
drop database mysqltest2;
|
||||
|
||||
--echo End of 5.1 tests
|
||||
|
||||
|
||||
Reference in New Issue
Block a user