bk commit into 5.0 tree (georg:1.2253)

[georg]

Below is the list of changes that have just been committed into a local
5.0 repository of georg. When georg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-08-31 10:34:06+02:00, georg@stripped +2 -0
  Testcase fixes

  mysql-test/t/system_mysql_db_fix.test@stripped, 2006-08-31 10:34:00+02:00,
georg@stripped +3 -0
    Test doesn't work on windows -> skipped

  tests/mysql_client_test.c@stripped, 2006-08-31 10:34:00+02:00, georg@stripped +3
-1
    fix for mysql_client_test (this was already fixed in 5.0 by Reggie)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.0-cmake

--- 1.195/tests/mysql_client_test.c	2006-08-31 10:34:22 +02:00
+++ 1.196/tests/mysql_client_test.c	2006-08-31 10:34:22 +02:00
@@ -10996,7 +10996,9 @@
   {
     rc= mysql_stmt_execute(stmt);
     check_execute(stmt, rc);
-    assert(1 == my_process_stmt_result(stmt));
+	
+    rc= my_process_stmt_result(stmt);
+    assert(1 == rc);
   }
   mysql_stmt_close(stmt);
 

--- 1.18/mysql-test/t/system_mysql_db_fix.test	2006-08-31 10:34:22 +02:00
+++ 1.19/mysql-test/t/system_mysql_db_fix.test	2006-08-31 10:34:22 +02:00
@@ -1,6 +1,9 @@
 # Embedded server doesn't support external clients
 --source include/not_embedded.inc
 
+# Windows doesn't support execution of *nix shell scripts (fix me!!)
+--source include/not_windows.inc
+
 #
 # This is the test for mysql_fix_privilege_tables
 #