diff options
| author | unknown <igor@rurik.mysql.com> | 2005-06-07 06:38:05 -0700 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-06-07 06:38:05 -0700 |
| commit | 3145787db91432deaaf51437855c06e7b26e8fe2 (patch) | |
| tree | 874410a623b21d2d3f837cc2e0e3c566f7a425be /mysql-test/r/ps_3innodb.result | |
| parent | e5a97df6631a3ae9f2cc96eeeb4854593e3a79d4 (diff) | |
| parent | d499ead64c468cab0fb03b98568e01bfd971f7b3 (diff) | |
| download | mariadb-git-3145787db91432deaaf51437855c06e7b26e8fe2.tar.gz | |
Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
myisam/mi_key.c:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
sql/item_buff.cc:
Auto merged
sql/sql_class.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/ps_3innodb.result')
| -rw-r--r-- | mysql-test/r/ps_3innodb.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/ps_3innodb.result b/mysql-test/r/ps_3innodb.result index 658fd01dd0d..851178e2aee 100644 --- a/mysql-test/r/ps_3innodb.result +++ b/mysql-test/r/ps_3innodb.result @@ -1152,13 +1152,13 @@ execute stmt1; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr def id 8 3 1 N 32929 0 63 def select_type 253 19 6 N 1 31 8 -def table 253 64 2 N 1 31 8 -def type 253 10 3 N 1 31 8 +def table 253 64 2 Y 0 31 8 +def type 253 10 3 Y 0 31 8 def possible_keys 253 4096 0 Y 0 31 8 def key 253 64 0 Y 0 31 8 def key_len 253 4096 0 Y 128 31 63 def ref 253 1024 0 Y 0 31 8 -def rows 8 10 1 N 32929 0 63 +def rows 8 10 1 Y 32928 0 63 def Extra 253 255 0 N 1 31 8 id select_type table type possible_keys key key_len ref rows Extra 1 SIMPLE t9 ALL NULL NULL NULL NULL 2 |