database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge marko@build.mysql.com:/home/bk/mysql-4.1

Browse Source 
into hundin.mysql.fi:/home/marko/j/mysql-4.1


mysql-test/r/create.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2004-05-06 09:53:50 +03:00
parent cc7a8d9bed e4ea53257c
commit f1a2e92562
9 changed files with 68 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,7 +371,6 @@ t1 0 PRIMARY 2 b A # NULL NULL BTREE
t1 0 c 1 c A # NULL NULL BTREE
t1 0 b 1 b A # NULL NULL BTREE
t1 1 a 1 a A # NULL NULL BTREE
t1 1 a_2 1 a A # NULL NULL BTREE
drop table t1;
create table t1 (col1 int not null, col2 char(4) not null, primary key(col1));
alter table t1 engine=innodb;