diff options
| author | unknown <pem@mysql.com> | 2003-12-16 16:12:28 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-12-16 16:12:28 +0100 |
| commit | b8fa1718502174c9d4599fd02c9ca0ffa74db1ef (patch) | |
| tree | 6c17d3cffec1fb7d5a50cf0dd8236f04c18f0291 /mysql-test/r/status.result | |
| parent | 241bb226993b5ea11e73903858b5ba0fdc6e6647 (diff) | |
| parent | 24794dbc6d5d0a1481b413c43e72c9bb731794c7 (diff) | |
| download | mariadb-git-b8fa1718502174c9d4599fd02c9ca0ffa74db1ef.tar.gz | |
Merge 4.1 to 5.0.
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/multi_update.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/null.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/r/status.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/distinct.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/multi_update.test:
Auto merged
mysql-test/t/null.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/status.result')
| -rw-r--r-- | mysql-test/r/status.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/status.result b/mysql-test/r/status.result index f93147d00c5..3134fdcf5ee 100644 --- a/mysql-test/r/status.result +++ b/mysql-test/r/status.result @@ -5,7 +5,7 @@ Table_locks_immediate 0 Table_locks_waited 0 SET SQL_LOG_BIN=0; drop table if exists t1; -create table t1(n int) type=myisam; +create table t1(n int) engine=myisam; insert into t1 values(1); lock tables t1 read; unlock tables; |