diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-04-03 21:19:12 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-04-03 21:19:12 +0300 |
| commit | 6b8e2938f21c508f67ec141256d1ffc77a935851 (patch) | |
| tree | 2559697c56918e4fd2af81f84fcce0ea24dc60d4 /mysql-test/r/myisam.result | |
| parent | fb9a939416165321ff4f8b9dae29363671b84de9 (diff) | |
| parent | dba3a0b03181126cfc46048396b96e5cd768fe5a (diff) | |
| download | mariadb-git-6b8e2938f21c508f67ec141256d1ffc77a935851.tar.gz | |
Merge with 4.0
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
Auto merged
BitKeeper/deleted/.del-mysql.xdc:
Delete: netware/mysql.xdc
BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
Auto merged
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
Auto merged
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
Auto merged
client/mysql.cc:
Auto merged
include/my_pthread.h:
Auto merged
libmysqld/examples/Makefile.am:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/backup.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysys/default.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_pthread.c:
Auto merged
mysys/thr_mutex.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/log.cc:
Auto merged
sql-bench/crash-me.sh:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_show.cc:
Auto merged
strings/my_vsnprintf.c:
Auto merged
sql/sql_parse.cc:
Merge with 4.0 (Ignore not existing tables with DROP TEMPOARAY TABLE on slave)
mysql-test/r/rpl_loaddata.result:
Auto merged
Diffstat (limited to 'mysql-test/r/myisam.result')
| -rw-r--r-- | mysql-test/r/myisam.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index c0914e23992..13e0933adf4 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -244,7 +244,7 @@ int, i967 int, i968 int, i969 int, i970 int, i971 int, i972 int, i973 int, i974 int, i975 int, i976 int, i977 int, i978 int, i979 int, i980 int, i981 int, i982 int, i983 int, i984 int, i985 int, i986 int, i987 int, i988 int, i989 int, i990 int, i991 int, i992 int, i993 int, i994 int, i995 int, i996 int, i997 int, i998 -int, i999 int, i1000 int) row_format=dynamic; +int, i999 int, i1000 int, b blob) row_format=dynamic; insert into t1 values (1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -283,7 +283,7 @@ insert into t1 values (1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); +1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, "Sergei"); drop table t1; CREATE TABLE `t1` ( `post_id` mediumint(8) unsigned NOT NULL auto_increment, |