Commit 91881b44 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


include/config-win.h:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/parse_file.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/field.cc:
  Resolve conflict
sql/ha_ndbcluster.cc:
  Resolve conflict
sql/log_event.cc:
  Resolve conflict
parents 3c4c332f bf1ebe98

mysql-test/r/bdb.result

+5 −0
Original line number Diff line number Diff line
@@ -1957,4 +1957,9 @@ d varchar(255) character set utf8, 
e varchar(255) character set utf8,

key (a,b,c,d,e)) engine=bdb;

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

set autocommit=0;

create table t1 (a int) engine=bdb;

commit;

alter table t1 add primary key(a);

drop table t1;

End of 5.0 tests

mysql-test/r/create.result

+27 −14
Original line number Diff line number Diff line
@@ -279,7 +279,6 @@ a b 
create table if not exists t1 select 3 as 'a',4 as 'b';

Warnings:

Note	1050	Table 't1' already exists

Warning	1364	Field 'a' doesn't have a default value

create table if not exists t1 select 3 as 'a',3 as 'b';

ERROR 23000: Duplicate entry '3' for key 1

select * from t1;
@@ -635,8 +634,6 @@ create table t1 ( 
a varchar(112) charset utf8 collate utf8_bin not null,

primary key (a)

) select 'test' as a ;

Warnings:

Warning	1364	Field 'a' doesn't have a default value

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (
@@ -652,9 +649,6 @@ create table t1 ( 
a varchar(12) charset utf8 collate utf8_bin not null, 

b int not null, primary key (a)

) select a, 1 as b from t2 ;

Warnings:

Warning	1364	Field 'a' doesn't have a default value

Warning	1364	Field 'b' doesn't have a default value

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (
@@ -666,12 +660,37 @@ drop table t1; 
create table t1 ( 

a varchar(12) charset utf8 collate utf8_bin not null, 

b int not null, primary key (a)

) select 'a' as a , 1 as b from t2 ;

) select a, 1 as c from t2 ;

Warnings:

Warning	1364	Field 'a' doesn't have a default value

Warning	1364	Field 'b' doesn't have a default value

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `b` int(11) NOT NULL,

  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL,

  `c` bigint(1) NOT NULL default '0',

  PRIMARY KEY  (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 ( 

a varchar(12) charset utf8 collate utf8_bin not null, 

b int null, primary key (a)

) select a, 1 as c from t2 ;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `b` int(11) default NULL,

  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL,

  `c` bigint(1) NOT NULL default '0',

  PRIMARY KEY  (`a`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t1;

create table t1 ( 

a varchar(12) charset utf8 collate utf8_bin not null,

b int not null, primary key (a)

) select 'a' as a , 1 as b from t2 ;

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` varchar(12) character set utf8 collate utf8_bin NOT NULL,

  `b` int(11) NOT NULL,
@@ -682,8 +701,6 @@ create table t1 ( 
a varchar(12) charset utf8 collate utf8_bin,

b int not null, primary key (a)

) select 'a' as a , 1 as b from t2 ;

Warnings:

Warning	1364	Field 'b' doesn't have a default value

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (
@@ -702,8 +719,6 @@ a1 varchar(12) charset utf8 collate utf8_bin not null, 
a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int,

primary key (a1)

) select a1,a2,a3,a4,a5,a6,a7,a8,a9 from t1 ;

Warnings:

Warning	1364	Field 'a1' doesn't have a default value

drop table t2;

create table t2 ( 

a1 varchar(12) charset utf8 collate utf8_bin,
@@ -719,8 +734,6 @@ a1 varchar(12) charset utf8 collate utf8_bin not null, 
a2 int, a3 int, a4 int, a5 int, a6 int, a7 int, a8 int, a9 int,

primary key (a1)

) select a1,a2,a3,a4,a5,a6,a7,a8,a9 from t1 ;

Warnings:

Warning	1364	Field 'a1' doesn't have a default value

drop table t2;

create table t2 ( a int default 3, b int default 3)

select a1,a2 from t1;

mysql-test/r/handler.result

+1 −1
Original line number Diff line number Diff line 
drop table if exists t1;

drop table if exists t1,t3,t4,t5;

create table t1 (a int, b char(10), key a(a), key b(a,b));

insert into t1 values

(17,"ddd"),(18,"eee"),(19,"fff"),(19,"yyy"),

mysql-test/r/kill.result

+0 −2
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ select ((@id := kill_id) - kill_id) from t1; 
((@id := kill_id) - kill_id)

0

kill @id;

select 1;

Got one of the listed errors

select ((@id := kill_id) - kill_id) from t1;

((@id := kill_id) - kill_id)

0

mysql-test/r/mysqlshow.result

+1 −1
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1,t2;

DROP TABLE IF EXISTS t1,t2,test1,test2;

CREATE TABLE t1 (a int);

INSERT INTO t1 VALUES (1),(2),(3);

CREATE TABLE t2 (a int, b int);