database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge mysql.com:/home/mydev/mysql-5.0

Browse Source 
into  mysql.com:/home/mydev/mysql-5.0-5000
This commit is contained in:
unknown
2005-09-26 09:18:31 +02:00
parent 03fd2da4fe ddd18a89ad
commit e2829d4199
8 changed files with 35 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/t/default.test
View File

@@ -40,7 +40,6 @@ CREATE TABLE t1 (a varchar(30) binary NOT NULL DEFAULT ' ',
ENGINE=InnoDB DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin;
--enable_warnings
SHOW CREATE TABLE t1;
INSERT into t1 (b) values ('1');
SHOW WARNINGS;
SELECT * from t1;

23
mysql-test/t/group_min_max.test
View File

@@ -655,26 +655,21 @@ select distinct a1 from t1 where a2 = 'b';
# Bug #12672: primary key implcitly included in every innodb index
#
create table bug12672 (
--disable_warnings
create table t4 (
pk_col int auto_increment primary key, a1 char(64), a2 char(64), b char(16), c char(16) not null, d char(16), dummy char(64) default ' '
) engine=innodb;
--enable_warnings
insert into t4 (a1, a2, b, c, d, dummy) select * from t1;
insert into bug12672 (a1, a2, b, c, d, dummy) select * from t1;
create index idx12672_0 on bug12672 (a1);
create index idx12672_1 on bug12672 (a1,a2,b,c);
create index idx12672_2 on bug12672 (a1,a2,b);
create index idx12672_0 on t4 (a1);
create index idx12672_1 on t4 (a1,a2,b,c);
create index idx12672_2 on t4 (a1,a2,b);
analyze table t1;
--replace_column 9 #
explain select distinct a1 from bug12672 where pk_col not in (1,2,3,4);
select distinct a1 from bug12672 where pk_col not in (1,2,3,4);
select distinct a1 from t4 where pk_col not in (1,2,3,4);
drop table bug12672;
drop table t1;
drop table t2;
drop table t3;
drop table t1,t2,t3,t4;
#
# Bug #6142: a problem with the empty innodb table

2
mysql-test/t/view.test
View File

@@ -2043,6 +2043,7 @@ drop view v1;
drop table t1;
# BUG#12941
#
--disable_warnings
create table t1 (
r_object_id char(16) NOT NULL,
group_name varchar(32) NOT NULL
@@ -2053,6 +2054,7 @@ create table t2 (
i_position int(11) NOT NULL,
users_names varchar(32) default NULL
) Engine = InnoDB;
--enable_warnings
create view v1 as select r_object_id, group_name from t1;
create view v2 as select r_object_id, i_position, users_names from t2;