Commit 1365856e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-clean 

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/r/sp.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/innobase/btr/btr0sea.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/dict/dict0load.c:
  Auto merged
storage/innobase/include/buf0buf.h:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/innobase/include/dict0load.h:
  Auto merged
storage/innobase/include/rem0cmp.h:
  Auto merged
storage/innobase/rem/rem0cmp.c:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
mysql-test/r/innodb.result:
  Resolve conflicts
sql/share/errmsg.txt:
  Resolve conflict
parents 440da8a7 43dd386d

mysql-test/r/innodb.result

+72 −11
Original line number Diff line number Diff line
@@ -2437,7 +2437,9 @@ a b 
20	NULL

drop table t1;

create table t1 (v varchar(65530), key(v));

ERROR HY000: Can't create table 'test.t1' (errno: 139)

Warnings:

Warning	1071	Specified key was too long; max key length is 767 bytes

drop table t1;

create table t1 (v varchar(65536));

Warnings:

Note	1246	Converting column 'v' from VARCHAR to TEXT
@@ -2577,22 +2579,49 @@ create table t8 (col1 blob, index(col1(767))) 
character set = latin1 engine = innodb;

create table t9 (col1 varchar(512), col2 varchar(512), index(col1, col2))

character set = latin1 engine = innodb;

show create table t9;

Table	Create Table

t9	CREATE TABLE `t9` (

  `col1` varchar(512) default NULL,

  `col2` varchar(512) default NULL,

  KEY `col1` (`col1`,`col2`)

) ENGINE=InnoDB DEFAULT CHARSET=latin1

drop table t1, t2, t3, t4, t5, t6, t7, t8, t9;

create table t1 (col1 varchar(768), index(col1))

character set = latin1 engine = innodb;

ERROR HY000: Can't create table 'test.t1' (errno: 139)

create table t2 (col1 varchar(768) primary key)

Warnings:

Warning	1071	Specified key was too long; max key length is 767 bytes

create table t2 (col1 varbinary(768), index(col1))

character set = latin1 engine = innodb;

ERROR HY000: Can't create table 'test.t2' (errno: 139)

create table t3 (col1 varbinary(768) primary key)

Warnings:

Warning	1071	Specified key was too long; max key length is 767 bytes

create table t3 (col1 text, index(col1(768)))

character set = latin1 engine = innodb;

ERROR HY000: Can't create table 'test.t3' (errno: 139)

create table t4 (col1 text, index(col1(768)))

Warnings:

Warning	1071	Specified key was too long; max key length is 767 bytes

create table t4 (col1 blob, index(col1(768)))

character set = latin1 engine = innodb;

ERROR HY000: Can't create table 'test.t4' (errno: 139)

create table t5 (col1 blob, index(col1(768)))

Warnings:

Warning	1071	Specified key was too long; max key length is 767 bytes

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `col1` varchar(768) default NULL,

  KEY `col1` (`col1`(767))

) ENGINE=InnoDB DEFAULT CHARSET=latin1

drop table t1, t2, t3, t4;

create table t1 (col1 varchar(768) primary key)

character set = latin1 engine = innodb;

ERROR 42000: Specified key was too long; max key length is 767 bytes

create table t2 (col1 varbinary(768) primary key)

character set = latin1 engine = innodb;

ERROR 42000: Specified key was too long; max key length is 767 bytes

create table t3 (col1 text, primary key(col1(768)))

character set = latin1 engine = innodb;

ERROR 42000: Specified key was too long; max key length is 767 bytes

create table t4 (col1 blob, primary key(col1(768)))

character set = latin1 engine = innodb;

ERROR HY000: Can't create table 'test.t5' (errno: 139)

ERROR 42000: Specified key was too long; max key length is 767 bytes

CREATE TABLE t1

(

id INT PRIMARY KEY
@@ -2772,6 +2801,38 @@ insert into t2 values (4,_ucs2 0x05612020,_ucs2 0x05612020,'taken'); 
drop table t1;

drop table t2;

commit;

set foreign_key_checks=0;

create table t2 (a int primary key, b int, foreign key (b) references t1(a)) engine = innodb;

create table t1(a char(10) primary key, b varchar(20)) engine = innodb;

ERROR HY000: Can't create table './test/t1.frm' (errno: 150)

set foreign_key_checks=1;

drop table t2;

set foreign_key_checks=0;

create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1;

create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=utf8;

ERROR HY000: Can't create table './test/t2.frm' (errno: 150)

set foreign_key_checks=1;

drop table t1;

set foreign_key_checks=0;

create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb;

create table t1(a varchar(10) primary key) engine = innodb;

alter table t1 modify column a int;

Got one of the listed errors

set foreign_key_checks=1;

drop table t2,t1;

set foreign_key_checks=0;

create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=latin1;

create table t1(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=latin1;

alter table t1 convert to character set utf8;

set foreign_key_checks=1;

drop table t2,t1;

set foreign_key_checks=0;

create table t2 (a varchar(10), foreign key (a) references t1(a)) engine = innodb DEFAULT CHARSET=latin1;

create table t3(a varchar(10) primary key) engine = innodb DEFAULT CHARSET=utf8;

rename table t3 to t1;

ERROR HY000: Error on rename of './test/t3' to './test/t1' (errno: 150)

set foreign_key_checks=1;

drop table t2,t3;

create table t1 (a varchar(255) character set utf8,

b varchar(255) character set utf8,

c varchar(255) character set utf8,

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;

mysql-test/r/sp-error.result

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ begin 
declare x int;

set x = val+3;

end|

ERROR 42000: No RETURN found in FUNCTION f

ERROR 42000: No RETURN found in FUNCTION test.f

create function f(val int) returns int

begin

declare x int;

mysql-test/r/sp.result

+39 −0
Original line number Diff line number Diff line
@@ -4153,4 +4153,43 @@ A local variable in a nested compound statement takes precedence over table colu 
a - local variable in a nested compound statement

A local variable in a nested compound statement takes precedence over table column in cursors

a - local variable in a nested compound statement

drop schema if exists mysqltest1|

Warnings:

Note	1008	Can't drop database 'mysqltest1'; database doesn't exist

drop schema if exists mysqltest2|

Warnings:

Note	1008	Can't drop database 'mysqltest2'; database doesn't exist

drop schema if exists mysqltest3|

Warnings:

Note	1008	Can't drop database 'mysqltest3'; database doesn't exist

create schema mysqltest1|

create schema mysqltest2|

create schema mysqltest3|

use mysqltest3|

create procedure mysqltest1.p1 (out prequestid varchar(100))

begin

call mysqltest2.p2('call mysqltest3.p3(1, 2)');

end|

create procedure mysqltest2.p2(in psql text)

begin

declare lsql text;

set @lsql= psql;

prepare lstatement from @lsql;

execute lstatement;

deallocate prepare lstatement;

end|

create procedure mysqltest3.p3(in p1 int)

begin

select p1;

end|

call mysqltest1.p1(@rs)|

ERROR 42000: Incorrect number of arguments for PROCEDURE mysqltest3.p3; expected 1, got 2

call mysqltest1.p1(@rs)|

ERROR 42000: Incorrect number of arguments for PROCEDURE mysqltest3.p3; expected 1, got 2

call mysqltest1.p1(@rs)|

ERROR 42000: Incorrect number of arguments for PROCEDURE mysqltest3.p3; expected 1, got 2

drop schema if exists mysqltest1|

drop schema if exists mysqltest2|

drop schema if exists mysqltest3|

use test|

drop table t1,t2;

mysql-test/r/type_binary.result

+23 −0
Original line number Diff line number Diff line
@@ -114,3 +114,26 @@ drop table t1; 
select hex(cast(0x10 as binary(2)));

hex(cast(0x10 as binary(2)))

1000

create table t1 (b binary(2), vb varbinary(2));

insert into t1 values(0x4120, 0x4120);

insert into t1 values(0x412020, 0x412020);

Warnings:

Warning	1265	Data truncated for column 'b' at row 1

Warning	1265	Data truncated for column 'vb' at row 1

drop table t1;

create table t1 (c char(2), vc varchar(2));

insert into t1 values(0x4120, 0x4120);

insert into t1 values(0x412020, 0x412020);

Warnings:

Note	1265	Data truncated for column 'vc' at row 1

drop table t1;

set @old_sql_mode= @@sql_mode, sql_mode= 'traditional';

create table t1 (b binary(2), vb varbinary(2));

insert into t1 values(0x4120, 0x4120);

insert into t1 values(0x412020, NULL);

ERROR 22001: Data too long for column 'b' at row 1

insert into t1 values(NULL, 0x412020);

ERROR 22001: Data too long for column 'vb' at row 1

drop table t1;

set @@sql_mode= @old_sql_mode;

End of 5.0 tests