diff options
| author | unknown <serg@serg.mylan> | 2005-03-26 19:49:24 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-26 19:49:24 +0100 |
| commit | 68717638d572dac02b82511809d3b5f9023c0872 (patch) | |
| tree | 5bb56d7c3d40836dcfebc8a965a7fc7eab54177b /mysql-test/r/ps_1general.result | |
| parent | 3fd639493aea5c340acc2e28617e8d917d54ff7d (diff) | |
| parent | b18f2c2a89d3896873a2df20e443a6a0b953cccf (diff) | |
| download | mariadb-git-68717638d572dac02b82511809d3b5f9023c0872.tar.gz | |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
acinclude.m4:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
Diffstat (limited to 'mysql-test/r/ps_1general.result')
| -rw-r--r-- | mysql-test/r/ps_1general.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result index 565d19c0991..35450a66165 100644 --- a/mysql-test/r/ps_1general.result +++ b/mysql-test/r/ps_1general.result @@ -469,7 +469,7 @@ prepare stmt1 from ' KILL 0 '; ERROR HY000: This command is not supported in the prepared statement protocol yet prepare stmt1 from ' explain select a from t1 order by b '; execute stmt1; -Catalog Database Table Table_alias Column Column_alias Name Type Length Max length Is_null Flags Decimals Charsetnr +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 @@ -485,7 +485,7 @@ id select_type table type possible_keys key key_len ref rows Extra SET @arg00=1 ; prepare stmt1 from ' explain select a from t1 where a > ? order by b '; execute stmt1 using @arg00; -Catalog Database Table Table_alias Column Column_alias Name Type Length Max length Is_null Flags Decimals Charsetnr +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 |