bk commit into 5.0 tree (konstantin:1.1975) BUG#14845

[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.1975 05/11/18 17:55:52 konstantin@stripped +3 -0
  A test case for Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA
  when COUNT(*) is 0". The bug itself cannot be repeated.

  tests/mysql_client_test.c
    1.165 05/11/18 17:55:45 konstantin@stripped +44 -0
    A test case for Bug#14845

  mysql-test/t/sp.test
    1.164 05/11/18 17:55:44 konstantin@stripped +21 -0
    An SQL language test case for Bug#14845

  mysql-test/r/sp.result
    1.171 05/11/18 17:55:44 konstantin@stripped +19 -0
    Test results were fixed (Bug#14845)

# 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-14845

--- 1.170/mysql-test/r/sp.result	2005-11-11 13:10:45 +03:00
+++ 1.171/mysql-test/r/sp.result	2005-11-18 17:55:44 +03:00
@@ -3648,4 +3648,23 @@
 42
 drop function bug14723|
 drop procedure bug14723|
+create procedure bug14845()
+begin
+declare a char(255);
+declare done int default 0;
+declare c cursor for select count(*) from t1 where 1 = 0;
+declare continue handler for sqlstate '02000' set done = 1;
+open c;
+repeat
+fetch c into a;
+if not done then
+select a;
+end if;
+until done end repeat;
+close c;
+end|
+call bug14845()|
+a
+0
+drop procedure bug14845|
 drop table t1,t2;

--- 1.163/mysql-test/t/sp.test	2005-11-11 13:10:45 +03:00
+++ 1.164/mysql-test/t/sp.test	2005-11-18 17:55:44 +03:00
@@ -4572,6 +4572,27 @@
 drop function bug14723|
 drop procedure bug14723|
 
+#
+# Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA when COUNT(*) is 0"
+# Check that when fetching from a cursor, COUNT(*) works properly.
+#
+create procedure bug14845()
+begin
+  declare a char(255);
+  declare done int default 0;
+  declare c cursor for select count(*) from t1 where 1 = 0;
+  declare continue handler for sqlstate '02000' set done = 1;
+  open c;
+  repeat
+    fetch c into a;
+    if not done then
+      select a;
+    end if;
+  until done end repeat;
+  close c;
+end|
+call bug14845()|
+drop procedure bug14845|
 
 #
 # BUG#NNNN: New bug synopsis

--- 1.164/tests/mysql_client_test.c	2005-11-17 16:20:01 +03:00
+++ 1.165/tests/mysql_client_test.c	2005-11-18 17:55:45 +03:00
@@ -14546,6 +14546,49 @@
   myquery(rc);
 }
 
+/*
+  Bug#14845 "mysql_stmt_fetch returns MYSQL_NO_DATA when COUNT(*) is 0"
+*/
+
+static void test_bug14845()
+{
+  MYSQL_STMT *stmt;
+  int rc;
+  const ulong type= CURSOR_TYPE_READ_ONLY;
+  const char *query= "select count(*) from t1 where 1 = 0";
+
+  myheader("test_bug14845");
+
+  rc= mysql_query(mysql, "drop table if exists t1");
+  myquery(rc);
+  rc= mysql_query(mysql, "create table t1 (id int(11) default null, "
+                         "name varchar(20) default null)"
+                         "engine=MyISAM DEFAULT CHARSET=utf8");
+  myquery(rc);
+  rc= mysql_query(mysql, "insert into t1 values (1,'abc'),(2,'def')");
+  myquery(rc);
+
+  stmt= mysql_stmt_init(mysql);
+  rc= mysql_stmt_attr_set(stmt, STMT_ATTR_CURSOR_TYPE, (const void*) &type);
+  check_execute(stmt, rc);
+
+  rc= mysql_stmt_prepare(stmt, query, strlen(query));
+  check_execute(stmt, rc);
+
+  rc= mysql_stmt_execute(stmt);
+  check_execute(stmt, rc);
+
+  rc= mysql_stmt_fetch(stmt);
+  DIE_UNLESS(rc == 0);
+
+  rc= mysql_stmt_fetch(stmt);
+  DIE_UNLESS(rc == MYSQL_NO_DATA);
+
+  /* Cleanup */
+  mysql_stmt_close(stmt);
+  rc= mysql_query(mysql, "drop table t1");
+  myquery(rc);
+}
 
 /*
   Read and parse arguments and MySQL options from my.cnf
@@ -14805,6 +14848,7 @@
   { "test_bug14210", test_bug14210 },
   { "test_bug13488", test_bug13488 },
   { "test_bug13524", test_bug13524 },
+  { "test_bug14845", test_bug14845 },
   { 0, 0 }
 };