diff options
| author | Chad MILLER <chad@mysql.com> | 2008-08-15 16:42:29 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-08-15 16:42:29 -0400 |
| commit | 86fd86ed9839204be5bbae11bc19a3e1a3728332 (patch) | |
| tree | 94de722ccdcd9bca5f90f9cc56c63b9d4079f262 /mysql-test/r/ps_5merge.result | |
| parent | 535a183964266db58342b90489dc12d350bb2465 (diff) | |
| parent | 21598ea0e6c9495aba817b0101488549e4e78bd3 (diff) | |
| download | mariadb-git-86fd86ed9839204be5bbae11bc19a3e1a3728332.tar.gz | |
Merge from 5.0-bugteam.
Diffstat (limited to 'mysql-test/r/ps_5merge.result')
| -rw-r--r-- | mysql-test/r/ps_5merge.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ps_5merge.result b/mysql-test/r/ps_5merge.result index bd3cd4ac1fc..0348d100393 100644 --- a/mysql-test/r/ps_5merge.result +++ b/mysql-test/r/ps_5merge.result @@ -1201,7 +1201,7 @@ 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 1365 0 Y 0 31 8 +def key_len 253 4096 0 Y 0 31 8 def ref 253 1024 0 Y 0 31 8 def rows 8 10 1 Y 32928 0 63 def Extra 253 255 0 N 1 31 8 @@ -4222,7 +4222,7 @@ 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 1365 0 Y 0 31 8 +def key_len 253 4096 0 Y 0 31 8 def ref 253 1024 0 Y 0 31 8 def rows 8 10 1 Y 32928 0 63 def Extra 253 255 0 N 1 31 8 |