database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.1
This commit is contained in:
gluh@gluh.mysql.r18.ru
2004-03-31 14:30:53 +05:00
parent 99f712a30b daba6b63b8
commit da3308ef57
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/innodb.result
View File

@ -1440,3 +1440,6 @@ third
2 2
3 3
drop table t1; drop table t1;
create table t1 (a int) engine=innodb;
create table t2 like t1;
drop table t1,t2;

7
mysql-test/t/innodb.test
View File

@ -1037,3 +1037,10 @@ create table t1 (id int, name char(10) not null, name2 char(10) not null) engi
insert into t1 values(1,'first','fff'),(2,'second','sss'),(3,'third','ttt'); insert into t1 values(1,'first','fff'),(2,'second','sss'),(3,'third','ttt');
select name2 from t1 union all select name from t1 union all select id from t1; select name2 from t1 union all select name from t1 union all select id from t1;
drop table t1; drop table t1;
#
# Bug2160
#
create table t1 (a int) engine=innodb;
create table t2 like t1;
drop table t1,t2;

1
sql/ha_innodb.h
View File

@ -95,7 +95,6 @@ class ha_innobase: public handler
HA_NOT_EXACT_COUNT | HA_NOT_EXACT_COUNT |
HA_NO_WRITE_DELAYED | HA_NO_WRITE_DELAYED |
HA_PRIMARY_KEY_IN_READ_INDEX | HA_PRIMARY_KEY_IN_READ_INDEX |
HA_DROP_BEFORE_CREATE |
HA_TABLE_SCAN_ON_INDEX), HA_TABLE_SCAN_ON_INDEX),
last_dup_key((uint) -1), last_dup_key((uint) -1),
start_of_scan(0) start_of_scan(0)