bzr push into mysql-6.0 branch (hezx:2700 to 2701)

[He Zhenxing]

 2701 He Zhenxing	2008-08-14
      merge 6.0-rpl-testfixes -> 6.0-rpl
modified:
  tests/mysql_client_test.c

 2700 He Zhenxing	2008-08-14
      merge 6.0-rpl-testfixes -> 6.0-rpl
modified:
  mysql-test/extra/rpl_tests/rpl_row_basic.test
  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
  mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
  mysql-test/suite/rpl_ndb_big/r/rpl_row_basic_7ndb.result
  sql/sql_binlog.cc
  sql/sql_cursor.cc
  tests/mysql_client_test.c

=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2008-08-14 09:13:16 +0000
+++ b/tests/mysql_client_test.c	2008-08-14 10:17:08 +0000
@@ -17888,6 +17888,7 @@ static void test_wl4284_1()
 static void test_bug38486(void)
 {
   MYSQL_STMT *stmt;
+  const char *stmt_text;
   unsigned long type= CURSOR_TYPE_READ_ONLY;
 
   DBUG_ENTER("test_bug38486");