bzr commit into mysql-5.5-bugfixing branch (holyfoot:3192)

[Alexey Botchkov]

#At file:///home/hf/work/55mrg/ based on revid:epotemkin@stripped

 3192 Alexey Botchkov	2010-08-25
      mysql.test fixed.
      Parts that aren't supposed to work on Windows moved to the separate
      mysql_not_windows.test.

    added:
      mysql-test/r/mysql_not_windows.result
      mysql-test/t/mysql_not_windows.test
    modified:
      mysql-test/r/mysql.result
      mysql-test/t/mysql.test
=== modified file 'mysql-test/r/mysql.result'
--- a/mysql-test/r/mysql.result	2010-08-19 11:35:47 +0000
+++ b/mysql-test/r/mysql.result	2010-08-25 08:17:15 +0000
@@ -432,8 +432,5 @@ Bug #47147: mysql client option --skip-c
 
 *************************** 1. row ***************************
 1
-Bug #54466 client 5.5 built from source lacks "pager" support
-a
-1
 
 End of tests

=== added file 'mysql-test/r/mysql_not_windows.result'
--- a/mysql-test/r/mysql_not_windows.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/mysql_not_windows.result	2010-08-25 08:17:15 +0000
@@ -0,0 +1,5 @@
+Bug #54466 client 5.5 built from source lacks "pager" support
+a
+1
+
+End of tests

=== modified file 'mysql-test/t/mysql.test'
--- a/mysql-test/t/mysql.test	2010-08-19 11:35:47 +0000
+++ b/mysql-test/t/mysql.test	2010-08-25 08:17:15 +0000
@@ -425,11 +425,5 @@ drop table t1;
 --echo
 --exec $MYSQL --skip-column-names --vertical test -e "select 1 as a"
 
-#
-# Bug #54466 client 5.5 built from source lacks "pager" support
-# 
---echo Bug #54466 client 5.5 built from source lacks "pager" support
---exec $MYSQL --pager test -e "select 1 as a"
-
 --echo
 --echo End of tests

=== added file 'mysql-test/t/mysql_not_windows.test'
--- a/mysql-test/t/mysql_not_windows.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/mysql_not_windows.test	2010-08-25 08:17:15 +0000
@@ -0,0 +1,15 @@
+-- source include/not_windows.inc
+# This test should work in embedded server after we fix mysqltest
+-- source include/not_embedded.inc
+#
+# Testing the MySQL command line client(mysql)
+#
+
+#
+# Bug #54466 client 5.5 built from source lacks "pager" support
+# 
+--echo Bug #54466 client 5.5 built from source lacks "pager" support
+--exec $MYSQL --pager test -e "select 1 as a"
+
+--echo
+--echo End of tests


Attachment: [text/bzr-bundle] bzr/[e-mail]