diff options
| author | unknown <serg@serg.mylan> | 2004-11-15 19:27:06 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-11-15 19:27:06 +0100 |
| commit | 03d82a4652c82fb1930e0e515877e8fffbb0e5b0 (patch) | |
| tree | f8bc0b4f9899e5b4a5f848426d4568de1213e64b /mysql-test/r/ps_3innodb.result | |
| parent | f3f73a48df66247e8c155fa429aeb1c42b2e7a55 (diff) | |
| parent | a59b0fbfd6b7627a4fdf2233482e732480dbe437 (diff) | |
| download | mariadb-git-03d82a4652c82fb1930e0e515877e8fffbb0e5b0.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
BitKeeper/etc/ignore:
auto-union
configure.in:
Auto merged
dbug/dbug.c:
Auto merged
include/my_dbug.h:
Auto merged
include/my_sys.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_isam.cc:
Auto merged
sql/ha_isammrg.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/ps_3innodb.result')
| -rw-r--r-- | mysql-test/r/ps_3innodb.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result index 09f19c3763c..adcf6064835 100644 --- a/mysql-test/r/ps_3innodb.result +++ b/mysql-test/r/ps_3innodb.result @@ -1772,7 +1772,7 @@ t5 CREATE TABLE `t5` ( `param10` bigint(20) default NULL, `const11` int(4) default NULL, `param11` bigint(20) default NULL, - `const12` char(0) default NULL, + `const12` binary(0) default NULL, `param12` bigint(20) default NULL, `param13` double default NULL, `param14` longtext, @@ -1802,7 +1802,7 @@ def test t5 t5 const10 const10 3 10 9 N 32769 0 63 def test t5 t5 param10 param10 8 20 9 Y 32768 0 63 def test t5 t5 const11 const11 3 4 4 Y 32768 0 63 def test t5 t5 param11 param11 8 20 4 Y 32768 0 63 -def test t5 t5 const12 const12 254 0 0 Y 0 0 8 +def test t5 t5 const12 const12 254 0 0 Y 128 0 63 def test t5 t5 param12 param12 8 20 0 Y 32768 0 63 def test t5 t5 param13 param13 5 20 0 Y 32768 31 63 def test t5 t5 param14 param14 252 16777215 0 Y 16 0 8 |