Commit 20334ba6 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1-new 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


sql/share/errmsg.txt:
  Auto merged
parents a7beb302 2e0f0d2d

mysql-test/r/information_schema.result

+13 −0
Original line number Diff line number Diff line
@@ -1162,3 +1162,16 @@ select user,db from information_schema.processlist; 
user	db

user3148	test

drop user user3148@localhost;

grant select on test.* to mysqltest_1@localhost;

create table t1 (id int);

create view v1 as select * from t1;

create definer = mysqltest_1@localhost

sql security definer view v2 as select 1;

select * from information_schema.views

where table_name='v1' or table_name='v2';

TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	VIEW_DEFINITION	CHECK_OPTION	IS_UPDATABLE	DEFINER	SECURITY_TYPE

NULL	test	v1		NONE	YES	root@localhost	DEFINER

NULL	test	v2	select 1 AS `1`	NONE	NO	mysqltest_1@localhost	DEFINER

drop view v1, v2;

drop table t1;

drop user mysqltest_1@localhost;

mysql-test/r/ndb_alter_table.result

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

DROP TABLE IF EXISTS t1, t2;

drop database if exists mysqltest;

CREATE TABLE t1 (

a INT NOT NULL,
@@ -328,3 +328,24 @@ select 'no_copy' from ndb_show_tables where id = @t1_id and name like '%t1%'; 
no_copy

no_copy

DROP TABLE t1, ndb_show_tables;

create table t1 (a int primary key auto_increment, b int) engine=ndb;

insert into t1 (b) values (101),(102),(103);

select * from t1 where a = 3;

a	b

3	103

alter table t1 rename t2;

insert into t2 (b) values (201),(202),(203);

select * from t2 where a = 6;

a	b

6	203

alter table t2 add c int;

insert into t2 (b) values (301),(302),(303);

select * from t2 where a = 9;

a	b	c

9	303	NULL

alter table t2 rename t1;

insert into t1 (b) values (401),(402),(403);

select * from t1 where a = 12;

a	b	c

12	403	NULL

drop table t1;

mysql-test/r/ndb_basic.result

+24 −24
Original line number Diff line number Diff line
@@ -642,30 +642,30 @@ counter datavalue 
6	newval

7	newval

8	newval

35	newval

36	newval

37	newval

38	newval

39	newval

40	newval

41	newval

42	newval

43	newval

44	newval

45	newval

46	newval

47	newval

48	newval

49	newval

50	newval

51	newval

52	newval

53	newval

54	newval

55	newval

56	newval

57	newval

58	newval

9	newval

10	newval

11	newval

12	newval

13	newval

14	newval

15	newval

16	newval

17	newval

18	newval

19	newval

20	newval

21	newval

22	newval

23	newval

24	newval

25	newval

26	newval

27	newval

28	newval

29	newval

30	newval

31	newval

32	newval

drop table t1;

CREATE TABLE t1 ( b INT ) PACK_KEYS = 0 ENGINE = ndb;

select * from t1;

mysql-test/r/partition.result

+14 −0
Original line number Diff line number Diff line
@@ -895,6 +895,10 @@ partition by key(a); 
insert into t1 values (1);

create index inx1 on t1(a);

drop table t1;

create table t1 (a int)

partition by key (a)

(partition p0 engine = MERGE);

ERROR HY000: MyISAM Merge handler cannot be used in partitioned tables

create table t1 (a varchar(1))

partition by key (a)

as select 'a';
@@ -922,4 +926,14 @@ CREATE TABLE t1 (a int, index(a)) PARTITION BY KEY(a); 
ALTER TABLE t1 DISABLE KEYS;

ALTER TABLE t1 ENABLE KEYS;

DROP TABLE t1;

create table t1 (a int)

engine=MEMORY

partition by key (a);

REPAIR TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	repair	note	The storage engine for the table doesn't support repair

OPTIMIZE TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	optimize	note	The storage engine for the table doesn't support optimize

drop table t1;

End of 5.1 tests

mysql-test/r/strict.result

+10 −0
Original line number Diff line number Diff line
@@ -1288,3 +1288,13 @@ ERROR 22001: Data too long for column 'a' at row 1 
select * from t1;

a

drop table t1;

set sql_mode='traditional';

create table t1 (date date not null);

create table t2 select date from t1;

show create table t2;

Table	Create Table

t2	CREATE TABLE `t2` (

  `date` date NOT NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table t2,t1;

set @@sql_mode= @org_mode;