diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-07-01 16:48:57 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-07-01 16:48:57 +0300 |
| commit | e2904e77f1803b00615e00caef5c057c36c10b86 (patch) | |
| tree | f082aac720c3fe4e32b3a8c776dcae674ea31d4c /mysql-test/r/ps_maria.result | |
| parent | 4b1fe65b5fd169ed6d870e38f126780ed2184536 (diff) | |
| parent | d6f2fda680ec2be373ff5694e91cfccf792f4eb0 (diff) | |
| download | mariadb-git-e2904e77f1803b00615e00caef5c057c36c10b86.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
include/maria.h:
Auto merged
sql/handler.h:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_close.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_pagecache.c:
Auto merged
storage/maria/ma_pagecache.h:
Auto merged
storage/maria/maria_chk.c:
Auto merged
storage/maria/ma_blockrec.c:
Manual merge (No changes)
storage/maria/ma_check.c:
Manual merge
storage/maria/ma_create.c:
Manual merge
storage/maria/ma_delete_all.c:
Manual merge
storage/maria/ma_init.c:
Manual merge (no changes)
storage/maria/ma_test_all.sh:
Manual merge
storage/maria/maria_def.h:
Manual merge
Diffstat (limited to 'mysql-test/r/ps_maria.result')
| -rw-r--r-- | mysql-test/r/ps_maria.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/ps_maria.result b/mysql-test/r/ps_maria.result index 9268c44eecd..b1ea905c406 100644 --- a/mysql-test/r/ps_maria.result +++ b/mysql-test/r/ps_maria.result @@ -1756,7 +1756,7 @@ set @arg14= 'abc'; set @arg14= NULL ; set @arg15= CAST('abc' as binary) ; set @arg15= NULL ; -create table t5 as select +create table t5 engine = MyISAM as select 8 as const01, @arg01 as param01, 8.0 as const02, @arg02 as param02, 80.00000000000e-1 as const03, @arg03 as param03, |