summaryrefslogtreecommitdiff
path: root/mysql-test/r/ps_1general.result
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-12-06 19:18:35 +0200
committermonty@mysql.com <>2004-12-06 19:18:35 +0200
commit77207d19f20f21c54b8d5279c6924f4c4bdaaa51 (patch)
tree44698f6f68c51daacf7552356ae071b8e8fdb035 /mysql-test/r/ps_1general.result
parente99d5fee828e40589d7a29b81bba32b53e94037a (diff)
parent67ce24796584e80cf843b37b09aeb794c9231190 (diff)
downloadmariadb-git-77207d19f20f21c54b8d5279c6924f4c4bdaaa51.tar.gz
Merge with new VARCHAR code
Diffstat (limited to 'mysql-test/r/ps_1general.result')
-rw-r--r--mysql-test/r/ps_1general.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index 9b12b0baa1d..0868ec3a364 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -277,7 +277,7 @@ t2 MyISAM 9 Fixed 0 0 0 64424509439 1024 0 NULL # # # latin1_swedish_ci NULL
prepare stmt4 from ' show table status from test like ''t9%'' ';
execute stmt4;
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
-t9 MyISAM 9 Dynamic 2 220 440 4294967295 2048 0 NULL # # # latin1_swedish_ci NULL
+t9 MyISAM 10 Dynamic 2 222 444 4294967295 2048 0 NULL # # # latin1_swedish_ci NULL
prepare stmt4 from ' show status like ''Threads_running'' ';
execute stmt4;
Variable_name Value
@@ -291,7 +291,7 @@ execute stmt4;
prepare stmt4 from ' show full processlist ';
execute stmt4;
Id User Host db Command Time State Info
-number root localhost test Query 0 NULL show full processlist
+number root localhost test Query seconds NULL show full processlist
prepare stmt4 from ' show grants for user ';
prepare stmt4 from ' show create table t2 ';
ERROR HY000: This command is not supported in the prepared statement protocol yet