bzr push into mysql-5.1 branch (davi:2691 to 2692) Bug#38486

[Davi Arnaut]

 2692 Davi Arnaut	2008-08-11 [merge]
      Merge mysql-5.0-bugteam into mysql-5.1-bugteam
modified:
  tests/mysql_client_test.c

 2691 Marc Alff	2008-08-11 [merge]
      Manual merge of mysql-5.0-bugteam -> mysql-5.1-bugteam
      
      Note: NULL merge of sql/sql_yacc.yy, the fix for bug#38296 will be provided separately for 5.1
modified:
  sql/field.h
  sql/item.h
  sql/sp_head.cc
  sql/sql_cursor.cc
  sql/sql_lex.h
  sql/sql_list.h
  sql/sql_string.h
  tests/mysql_client_test.c

=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2008-08-11 22:44:13 +0000
+++ b/tests/mysql_client_test.c	2008-08-12 00:27:17 +0000
@@ -17600,25 +17600,28 @@ static void test_wl4166_2()
 
 static void test_bug38486(void)
 {
-    myheader("test_bug38486");
-    
-    MYSQL_STMT *stmt;
-    stmt= mysql_stmt_init(mysql);
-    unsigned long type= CURSOR_TYPE_READ_ONLY;
-    mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*)&type);
-    const char *sql= "CREATE TABLE t1 (a INT)";
-    mysql_stmt_prepare(stmt,sql,strlen(sql));
-    
-    mysql_stmt_execute(stmt);
-    mysql_stmt_close(stmt);
-    
-    stmt= mysql_stmt_init(mysql);
-    mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*)&type);
-    const char *sql2= "INSERT INTO t1 VALUES (1)";
-    mysql_stmt_prepare(stmt,sql2,strlen(sql2));
-    mysql_stmt_execute(stmt);
-    
-    mysql_stmt_close(stmt);
+  MYSQL_STMT *stmt;
+  const char *stmt_text;
+  unsigned long type= CURSOR_TYPE_READ_ONLY;
+
+  DBUG_ENTER("test_bug38486");
+  myheader("test_bug38486");
+
+  stmt= mysql_stmt_init(mysql);
+  mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*)&type);
+  stmt_text= "CREATE TABLE t1 (a INT)";
+  mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text));
+  mysql_stmt_execute(stmt);
+  mysql_stmt_close(stmt);
+
+  stmt= mysql_stmt_init(mysql);
+  mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*)&type);
+  stmt_text= "INSERT INTO t1 VALUES (1)";
+  mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text));
+  mysql_stmt_execute(stmt);
+  mysql_stmt_close(stmt);
+
+  DBUG_VOID_RETURN;
 }
 
 /*