Commit 2097b7f4 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/pem/bug14233/mysql-5.0 

into  mysql.com:/usr/home/pem/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
sql/share/errmsg.txt:
  Manual merge.
parents ac36a084 29eac312

mysql-test/r/mysqltest.result

+1 −1
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ root@localhost 
--------------------------------------------------------------------------------

this will be executed

this will be executed

mysqltest: At line 2: query 'create table t1 (a int primary key);

mysqltest: At line 3: query 'create table t1 (a int primary key);

insert into t1 values (1);

select 'select-me';

insertz 'error query'' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'insertz 'error query'' at line 1

mysql-test/r/rpl_deadlock.result

+1 −1
Original line number Diff line number Diff line
@@ -83,5 +83,5 @@ a 
22

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	18911	#	#	master-bin.000001	Yes	Yes							0		0	18911	#	None		0	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	18911	#	#	master-bin.000001	#	Yes							0		0	18911	#	None		0	No						#

drop table t1,t2,t3,t4;

mysql-test/r/rpl_relayrotate.result

+0 −3
Original line number Diff line number Diff line
@@ -16,7 +16,4 @@ master_pos_wait('master-bin.001',3000)>=0 
select max(a) from t1;

max(a)

8000

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	735186	#	#	master-bin.000001	Yes	Yes							0		0	735186	#	None		0	No						#

drop table t1;

mysql-test/r/rpl_until.result

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ n 
2

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	776	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	608	#	Relay	slave-relay-bin.000004	746	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	776	slave-relay-bin.000004	#	master-bin.000001	#	No							0		0	608	#	Relay	slave-relay-bin.000004	746	No						#

start slave;

stop slave;

start slave until master_log_file='master-bin.000001', master_log_pos=776;

mysql-test/r/sp-destruct.result

0 → 100644
+77 −0
Original line number Diff line number Diff line 
use test;

drop procedure if exists bug14233;

drop function if exists bug14233;

drop table if exists t1;

drop view if exists v1;

create procedure bug14233()

set @x = 42;

create function bug14233_f() returns int

return 42;

create table t1 (id int);

create trigger t1_ai after insert on t1 for each row call bug14233();

alter table mysql.proc drop type;

call bug14233();

ERROR HY000: Failed to load routine test.bug14233. The table mysql.proc is missing, corrupt, or contains bad data (internal code -5)

create view v1 as select bug14233_f();

ERROR HY000: Failed to load routine test.bug14233_f. The table mysql.proc is missing, corrupt, or contains bad data (internal code -5)

insert into t1 values (0);

ERROR HY000: Failed to load routine test.bug14233. The table mysql.proc is missing, corrupt, or contains bad data (internal code -5)

flush table mysql.proc;

call bug14233();

ERROR HY000: Incorrect information in file: './mysql/proc.frm'

create view v1 as select bug14233_f();

ERROR HY000: Incorrect information in file: './mysql/proc.frm'

insert into t1 values (0);

ERROR HY000: Incorrect information in file: './mysql/proc.frm'

flush table mysql.proc;

call bug14233();

ERROR 42S02: Table 'mysql.proc' doesn't exist

create view v1 as select bug14233_f();

ERROR 42S02: Table 'mysql.proc' doesn't exist

insert into t1 values (0);

ERROR 42S02: Table 'mysql.proc' doesn't exist

flush table mysql.proc;

flush privileges;

delete from mysql.proc where name like 'bug14233%';

insert into mysql.proc

(

db, name, type, specific_name, language, sql_data_access, is_deterministic,

security_type, param_list, returns, body, definer, created, modified,

sql_mode, comment

)

values

(

'test', 'bug14233_1', 'FUNCTION', 'bug14233_1', 'SQL', 'READS_SQL_DATA', 'NO',

'DEFINER', '', 'int(10)',

'select count(*) from mysql.user',

'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''

),

(

'test', 'bug14233_2', 'FUNCTION', 'bug14233_2', 'SQL', 'READS_SQL_DATA', 'NO',

'DEFINER', '', 'int(10)',

'begin declare x int; select count(*) into x from mysql.user; end',

'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''

),

(

'test', 'bug14233_3', 'PROCEDURE', 'bug14233_3', 'SQL', 'READS_SQL_DATA','NO',

'DEFINER', '', '',

'alksj wpsj sa ^#!@ ',

'root@localhost', NOW() , '0000-00-00 00:00:00', '', ''

);

select bug14233_1();

ERROR HY000: Failed to load routine test.bug14233_1. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)

create view v1 as select bug14233_1();

ERROR HY000: Failed to load routine test.bug14233_1. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)

select bug14233_2();

ERROR HY000: Failed to load routine test.bug14233_2. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)

create view v1 as select bug14233_2();

ERROR HY000: Failed to load routine test.bug14233_2. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)

call bug14233_3();

ERROR HY000: Failed to load routine test.bug14233_3. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)

drop trigger t1_ai;

create trigger t1_ai after insert on t1 for each row call bug14233_3();

insert into t1 values (0);

ERROR HY000: Failed to load routine test.bug14233_3. The table mysql.proc is missing, corrupt, or contains bad data (internal code -6)

delete from mysql.proc where name like 'bug14233%';

drop trigger t1_ai;

drop table t1;