bk commit into 5.0 tree (konstantin:1.1838)

[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.1838 05/03/24 15:17:39 konstantin@stripped +4 -0
  Manual merge

  tests/mysql_client_test.c
    1.109 05/03/24 15:17:32 konstantin@stripped +42 -43
    Manual merge

  sql/sql_select.h
    1.79 05/03/24 15:17:32 konstantin@stripped +0 -0
    Manual merge

  sql/sql_prepare.cc
    1.108 05/03/24 15:17:32 konstantin@stripped +0 -0
    Manual merge

  libmysql/libmysql.c
    1.205 05/03/24 15:17:31 konstantin@stripped +0 -0
    Manual merge

# 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:	/media/sda1/mysql/current/RESYNC

--- 1.204/libmysql/libmysql.c	2005-03-21 15:43:12 +03:00
+++ 1.205/libmysql/libmysql.c	2005-03-24 15:17:31 +03:00
@@ -2862,6 +2862,17 @@
       mysql->status= MYSQL_STATUS_READY;
       stmt->read_row_func= stmt_read_row_from_cursor;
     }
+    else if (stmt->flags & CURSOR_TYPE_READ_ONLY)
+    {
+      /*
+        This is a single-row result set, a result set with no rows, EXPLAIN,
+        SHOW VARIABLES, or some other command which either a) bypasses the
+        cursors framework in the server and writes rows directly to the
+        network or b) is more efficient if all (few) result set rows are
+        precached on client and server's resources are freed.
+      */
+      DBUG_RETURN(mysql_stmt_store_result(stmt));
+    }
     else
     {
       stmt->mysql->unbuffered_fetch_owner= &stmt->unbuffered_fetch_cancelled;

--- 1.78/sql/sql_select.h	2005-03-19 03:12:22 +03:00
+++ 1.79/sql/sql_select.h	2005-03-24 15:17:32 +03:00
@@ -370,7 +370,7 @@
   void close();
 
   void set_unit(SELECT_LEX_UNIT *unit_arg) { unit= unit_arg; }
-  Cursor() :join(0), unit(0) {}
+  Cursor() :Item_arena(TRUE), join(0), unit(0) {}
   ~Cursor();
 };
 

--- 1.107/sql/sql_prepare.cc	2005-03-17 14:27:29 +03:00
+++ 1.108/sql/sql_prepare.cc	2005-03-24 15:17:32 +03:00
@@ -1970,6 +1970,7 @@
 {
   ulong stmt_id= uint4korr(packet);
   ulong flags= (ulong) ((uchar) packet[4]);
+  Cursor *cursor= 0;
   /*
     Query text for binary log, or empty string if the query is not put into
     binary log.
@@ -2007,15 +2008,17 @@
         statement: we can't open a cursor for it.
       */
       flags= 0;
+      my_error(ER_SP_BAD_CURSOR_QUERY, MYF(0));
+      goto err;
     }
     else
     {
       DBUG_PRINT("info",("Using READ_ONLY cursor"));
       if (!stmt->cursor &&
-          !(stmt->cursor= new (&stmt->main_mem_root) Cursor()))
+          !(cursor= stmt->cursor= new (&stmt->main_mem_root) Cursor()))
         DBUG_VOID_RETURN;
       /* If lex->result is set, mysql_execute_command will use it */
-      stmt->lex->result= &stmt->cursor->result;
+      stmt->lex->result= &cursor->result;
     }
   }
 #ifndef EMBEDDED_LIBRARY
@@ -2061,11 +2064,10 @@
     my_pthread_setprio(pthread_self(), WAIT_PRIOR);
   thd->protocol= &thd->protocol_simple;         // Use normal protocol
 
-  if (flags & (ulong) CURSOR_TYPE_READ_ONLY)
+  if (cursor && cursor->is_open())
   {
-    if (stmt->cursor->is_open())
-      stmt->cursor->init_from_thd(thd);
-    stmt->cursor->state= stmt->state;
+    cursor->init_from_thd(thd);
+    cursor->state= stmt->state;
   }
   else
   {

--- 1.108/tests/mysql_client_test.c	2005-03-24 00:48:11 +03:00
+++ 1.109/tests/mysql_client_test.c	2005-03-24 15:17:32 +03:00
@@ -12782,6 +12782,72 @@
 }
 
 
+MYSQL_STMT *open_cursor(char *query)
+{
+  int rc;
+  const ulong type= (ulong)CURSOR_TYPE_READ_ONLY;
+
+  MYSQL_STMT *stmt= mysql_stmt_init(mysql);
+  rc= mysql_stmt_prepare(stmt, query, strlen(query));
+  check_execute(stmt, rc);
+
+  mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (void*) &type);
+  return stmt;
+}
+
+
+static void test_bug8880()
+{
+  MYSQL_STMT *stmt_list[2], **stmt;
+  MYSQL_STMT **stmt_list_end= (MYSQL_STMT**) stmt_list + 2;
+  int rc;
+
+  myheader("test_bug8880");
+
+  mysql_query(mysql, "drop table if exists t1");
+  mysql_query(mysql, "create table t1 (a int not null primary key, b int)");
+  rc= mysql_query(mysql, "insert into t1 values (1,1)");
+  myquery(rc);                                  /* one check is enough */
+  /*
+    when inserting 2 rows everything works well
+    mysql_query(mysql, "INSERT INTO t1 VALUES (1,1),(2,2)");
+  */
+  for (stmt= stmt_list; stmt < stmt_list_end; stmt++)
+    *stmt= open_cursor("select a from t1");
+  for (stmt= stmt_list; stmt < stmt_list_end; stmt++)
+  {
+    rc= mysql_stmt_execute(*stmt);
+    check_execute(*stmt, rc);
+  }
+  for (stmt= stmt_list; stmt < stmt_list_end; stmt++)
+    mysql_stmt_close(*stmt);
+}
+
+
+static void test_bug9159()
+{
+  MYSQL_STMT *stmt;
+  int rc;
+  const char *stmt_text= "select a, b from t1";
+  const unsigned long type= CURSOR_TYPE_READ_ONLY;
+
+  myheader("test_bug9159");
+
+  mysql_query(mysql, "drop table if exists t1");
+  mysql_query(mysql, "create table t1 (a int not null primary key, b int)");
+  rc= mysql_query(mysql, "insert into t1 values (1,1)");
+  myquery(rc);
+
+  stmt= mysql_stmt_init(mysql);
+  mysql_stmt_prepare(stmt, stmt_text, strlen(stmt_text));
+  mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (const void *)&type);
+
+  mysql_stmt_execute(stmt);
+  mysql_stmt_close(stmt);
+  rc= mysql_query(mysql, "drop table if exists t1");
+  myquery(rc);
+}
+
 /*
   Read and parse arguments and MySQL options from my.cnf
 */
@@ -13005,6 +13071,8 @@
   { "test_bug7990", test_bug7990 },
   { "test_bug8378", test_bug8378 },
   { "test_bug8722", test_bug8722 },
+  { "test_bug8880", test_bug8880 },
+  { "test_bug9159", test_bug9159 },
   { 0, 0 }
 };