diff options
| author | unknown <brian@zim.(none)> | 2006-08-14 03:26:53 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-14 03:26:53 -0700 |
| commit | 03830dd6097d462d1a680e6ced7cfa94ae65db07 (patch) | |
| tree | 323751f1a712a89f3fdc2a9d887f48cde9f2cc5b | |
| parent | 1363c9b215a2e01e6437fdaa16db0fa86e57362f (diff) | |
| download | mariadb-git-03830dd6097d462d1a680e6ced7cfa94ae65db07.tar.gz | |
Updated row result, and fix for Windows build.
CMakeLists.txt:
Fix for Windows build
mysql-test/r/binlog_row_binlog.result:
Updated row result
mysql-test/r/multi_update.result:
Updated row result
mysql-test/t/multi_update.test:
Updated row result
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | mysql-test/r/binlog_row_binlog.result | 6 | ||||
| -rw-r--r-- | mysql-test/r/multi_update.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/multi_update.test | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5edc33b9f5a..ec744e975c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,9 +131,6 @@ ADD_SUBDIRECTORY(client) IF(WITH_ARCHIVE_STORAGE_ENGINE) ADD_SUBDIRECTORY(storage/archive) ENDIF(WITH_ARCHIVE_STORAGE_ENGINE) -IF(WITH_BERKELEY_STORAGE_ENGINE) - ADD_SUBDIRECTORY(storage/bdb) -ENDIF(WITH_BERKELEY_STORAGE_ENGINE) IF(WITH_BLACKHOLE_STORAGE_ENGINE) ADD_SUBDIRECTORY(storage/blackhole) ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE) diff --git a/mysql-test/r/binlog_row_binlog.result b/mysql-test/r/binlog_row_binlog.result index 17c1d171b5c..28f2284d3d2 100644 --- a/mysql-test/r/binlog_row_binlog.result +++ b/mysql-test/r/binlog_row_binlog.result @@ -1,6 +1,6 @@ drop table if exists t1, t2; reset master; -create table t1 (a int) engine=bdb; +create table t1 (a int) engine=innodb; create table t2 (a int) engine=innodb; begin; insert t1 values (5); @@ -10,12 +10,12 @@ insert t2 values (5); commit; show binlog events from 102; Log_name Pos Event_type Server_id End_log_pos Info -master-bin.000001 # Query 1 # use `test`; create table t1 (a int) engine=bdb +master-bin.000001 # Query 1 # use `test`; create table t1 (a int) engine=innodb master-bin.000001 # Query 1 # use `test`; create table t2 (a int) engine=innodb master-bin.000001 # Query 1 # use `test`; BEGIN master-bin.000001 # Table_map 1 # table_id: # (test.t1) master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F -master-bin.000001 # Query 1 # use `test`; COMMIT +master-bin.000001 # Xid 1 # COMMIT /* xid= */ master-bin.000001 # Query 1 # use `test`; BEGIN master-bin.000001 # Table_map 1 # table_id: # (test.t2) master-bin.000001 # Write_rows 1 # table_id: # flags: STMT_END_F diff --git a/mysql-test/r/multi_update.result b/mysql-test/r/multi_update.result index 8791b8cc080..3ed0222fcdb 100644 --- a/mysql-test/r/multi_update.result +++ b/mysql-test/r/multi_update.result @@ -492,7 +492,7 @@ create table t2 like t1; insert into t2 select * from t1; delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b; drop table t1,t2; -create table t1 ( c char(8) not null ) engine=bdb; +create table t1 ( c char(8) not null ) engine=innodb; insert into t1 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9'); insert into t1 values ('A'),('B'),('C'),('D'),('E'),('F'); alter table t1 add b char(8) not null; diff --git a/mysql-test/t/multi_update.test b/mysql-test/t/multi_update.test index 21271517564..9cd93f2c7dd 100644 --- a/mysql-test/t/multi_update.test +++ b/mysql-test/t/multi_update.test @@ -485,7 +485,7 @@ delete t1,t2 from t2,t1 where t1.a<'B' and t2.b=t1.b; drop table t1,t2; --disable_warnings -create table t1 ( c char(8) not null ) engine=bdb; +create table t1 ( c char(8) not null ) engine=innodb; --enable_warnings insert into t1 values ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7'),('8'),('9'); |