bk commit into 5.0 tree (konstantin:1.1959)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 repository of kostja. When kostja 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
  1.1959 05/06/20 15:35:17 konstantin@stripped +3 -0
  Fix a formatting bug and add a test for it.

  tests/mysql_client_test.c
    1.128 05/06/20 15:35:12 konstantin@stripped +14 -1
    Test the server side error message.

  sql/sql_prepare.cc
    1.125 05/06/20 15:35:12 konstantin@stripped +1 -1
    Fix a formatting bug.

  sql/share/errmsg.txt
    1.34 05/06/20 15:35:12 konstantin@stripped +1 -1
    Fix a formatting bug.

# 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:	konstantin
# Host:	dragonfly.local
# Root:	/opt/local/work/mysql-5.0-root

--- 1.33/sql/share/errmsg.txt	2005-06-19 19:39:02 +04:00
+++ 1.34/sql/share/errmsg.txt	2005-06-20 15:35:12 +04:00
@@ -5355,6 +5355,6 @@
 ER_EXEC_STMT_WITH_OPEN_CURSOR
 	eng "You can't execute a prepared statement which has an open cursor associated with it.
Reset the statement to re-execute it."
 ER_STMT_HAS_NO_OPEN_CURSOR
-	eng "The statement (%d) has no open cursor."
+	eng "The statement (%lu) has no open cursor."
 ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
         eng "Explicit or implicit commit is not allowed in stored function or trigger."

--- 1.124/sql/sql_prepare.cc	2005-06-17 23:27:21 +04:00
+++ 1.125/sql/sql_prepare.cc	2005-06-20 15:35:12 +04:00
@@ -2209,7 +2209,7 @@
 
   if (!stmt->cursor || !stmt->cursor->is_open())
   {
-    my_error(ER_STMT_HAS_NO_OPEN_CURSOR, MYF(0));
+    my_error(ER_STMT_HAS_NO_OPEN_CURSOR, MYF(0), stmt_id);
     DBUG_VOID_RETURN;
   }
 

--- 1.127/tests/mysql_client_test.c	2005-06-19 17:31:14 +04:00
+++ 1.128/tests/mysql_client_test.c	2005-06-20 15:35:12 +04:00
@@ -12995,6 +12995,19 @@
     rc= mysql_stmt_fetch(stmt);
     DIE_UNLESS(rc == MYSQL_NO_DATA);
 
+    {
+      char buff[8];
+      /* Fill in the fethc packet */
+      int4store(buff, stmt->stmt_id);
+      buff[4]= 1;                               /* prefetch rows */
+      rc= ((*mysql->methods->advanced_command)(mysql, COM_STMT_FETCH, buff,
+                                               sizeof(buff), 0,0,1) ||
+           (*mysql->methods->read_query_result)(mysql));
+      DIE_UNLESS(rc);
+      if (!opt_silent && i == 0)
+        printf("Got error (as expected): %s\n", mysql_error(mysql));
+    }
+
     rc= mysql_stmt_execute(stmt);
     check_execute(stmt, rc);
 
@@ -13039,7 +13052,7 @@
       /* Fill in the execute packet */
       int4store(buff, stmt->stmt_id);
       buff[4]= 0;                               /* Flag */
-      int4store(buff+5, 1);                     /* Return 1 row */
+      int4store(buff+5, 1);                     /* Reserved for array bind */
       rc= ((*mysql->methods->advanced_command)(mysql, COM_STMT_EXECUTE, buff,
                                                sizeof(buff), 0,0,1) ||
            (*mysql->methods->read_query_result)(mysql));