Skip to content

M
MariaDB
Commit 6413db85 authored by unknown's avatar unknown
Browse files
Options

merge 5.0-opt -> 5.1-opt

parent 589762cf
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
mysql-test/include/mix1.inc
View file @ 6413db85
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
eval SET SESSION STORAGE_ENGINE = $engine_type; eval SET SESSION STORAGE_ENGINE = $engine_type;
--disable_warnings --disable_warnings
drop table if exists t1,t2,t3,t4,t1m,t1i,t2m,t2i,t4; drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4;
--enable_warnings --enable_warnings
......
mysql-test/r/innodb_mysql.result
View file @ 6413db85
SET SESSION STORAGE_ENGINE = InnoDB; SET SESSION STORAGE_ENGINE = InnoDB;
drop table if exists t1,t2,t3,t4,t1m,t1i,t2m,t2i,t4; drop table if exists t1,t2,t3,t1m,t1i,t2m,t2i,t4;
create table t1 ( create table t1 (
c_id int(11) not null default '0', c_id int(11) not null default '0',
org_id int(11) default null, org_id int(11) default null,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7