summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <ramil@mysql.com>2005-07-08 12:54:00 +0500
committerunknown <ramil@mysql.com>2005-07-08 12:54:00 +0500
commit2d4e858aa37f20f1c1861d1fd5925bbc1799b3d2 (patch)
tree6b38292efa97b4759a489bad2f6f076e23106e92
parent49fc6635c67d3f176b918946d6952aa2b7c39d4c (diff)
downloadmariadb-git-2d4e858aa37f20f1c1861d1fd5925bbc1799b3d2.tar.gz
a fix (bug #11809: ps_1general.test fails on QNX).
mysql-test/r/ps_1general.result: a fix (bug #11809: ps_1general.test fails on QNX). replace Max_data_length column value with '#' as well mysql-test/t/ps_1general.test: a fix (bug #11809: ps_1general.test fails on QNX). replace Max_data_length column value with '#' as well
-rw-r--r--mysql-test/r/ps_1general.result4
-rw-r--r--mysql-test/t/ps_1general.test6
2 files changed, 4 insertions, 6 deletions
diff --git a/mysql-test/r/ps_1general.result b/mysql-test/r/ps_1general.result
index 75824aa7213..f2d60ac5025 100644
--- a/mysql-test/r/ps_1general.result
+++ b/mysql-test/r/ps_1general.result
@@ -290,11 +290,11 @@ t2 1 t2_idx 1 b A NULL NULL NULL YES BTREE
prepare stmt4 from ' show table status from test like ''t2%'' ';
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
-t2 MyISAM 10 Fixed 0 0 0 4222124650659839 1024 0 NULL # # # latin1_swedish_ci NULL
+t2 MyISAM 10 Fixed 0 0 0 # 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 10 Dynamic 2 216 432 281474976710655 2048 0 NULL # # # latin1_swedish_ci NULL
+t9 MyISAM 10 Dynamic 2 216 432 # 2048 0 NULL # # # latin1_swedish_ci NULL
prepare stmt4 from ' show status like ''Threads_running'' ';
execute stmt4;
Variable_name Value
diff --git a/mysql-test/t/ps_1general.test b/mysql-test/t/ps_1general.test
index 1c247240eb9..ab133e4c347 100644
--- a/mysql-test/t/ps_1general.test
+++ b/mysql-test/t/ps_1general.test
@@ -307,15 +307,13 @@ prepare stmt4 from ' show index from t2 from test ';
execute stmt4;
prepare stmt4 from ' show table status from test like ''t2%'' ';
# egalize date and time values
---replace_column 12 # 13 # 14 #
---replace_result 2147483647 64424509439
+--replace_column 8 # 12 # 13 # 14 #
# Bug#4288 : prepared statement 'show table status ..', wrong output on execute
execute stmt4;
# try the same with the big table
prepare stmt4 from ' show table status from test like ''t9%'' ';
# egalize date and time values
---replace_column 12 # 13 # 14 #
---replace_result 2147483647 4294967295
+--replace_column 8 # 12 # 13 # 14 #
# Bug#4288
execute stmt4;
prepare stmt4 from ' show status like ''Threads_running'' ';