bk commit into 5.0 tree (ramil:1.2099)

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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.2099 06/03/03 09:35:25 ramil@stripped +2 -0
  Merge rkalimullin@stripped:/home/bk/mysql-5.0
  into  mysql.com:/usr/home/ram/work/5.0.b17615

  mysql-test/t/sp.test
    1.179 06/03/03 09:35:13 ramil@stripped +22 -23
    merging

  mysql-test/r/sp.result
    1.190 06/03/03 09:35:13 ramil@stripped +14 -14
    merging

# 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:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/5.0.b17615/RESYNC

--- 1.189/mysql-test/r/sp.result	2006-03-02 15:05:42 +04:00
+++ 1.190/mysql-test/r/sp.result	2006-03-03 09:35:13 +04:00
@@ -4782,4 +4782,23 @@ a
 foo string
 drop function bug17615|
 drop table t3|
+drop procedure if exists bug17476|
+create table t3 ( d date )|
+insert into t3 values
+( '2005-01-01' ), ( '2005-01-02' ), ( '2005-01-03' ),
+( '2005-01-04' ), ( '2005-02-01' ), ( '2005-02-02' )|
+create procedure bug17476(pDateFormat varchar(10))
+select date_format(t3.d, pDateFormat), count(*)
+from t3 
+group by date_format(t3.d, pDateFormat)|
+call bug17476('%Y-%m')|
+date_format(t3.d, pDateFormat)	count(*)
+2005-01	4
+2005-02	2
+call bug17476('%Y-%m')|
+date_format(t3.d, pDateFormat)	count(*)
+2005-01	4
+2005-02	2
+drop table t3|
+drop procedure bug17476|
 drop table t1,t2;

--- 1.178/mysql-test/t/sp.test	2006-03-02 15:05:42 +04:00
+++ 1.179/mysql-test/t/sp.test	2006-03-03 09:35:13 +04:00
@@ -5638,6 +5638,30 @@ drop function bug17615|
 drop table t3|
 
 
+# BUG#17476: Stored procedure not returning data when it is called first
+#            time per connection
+#
+--disable_warnings
+drop procedure if exists bug17476|
+--enable_warnings
+
+create table t3 ( d date )|
+insert into t3 values
+  ( '2005-01-01' ), ( '2005-01-02' ), ( '2005-01-03' ),
+  ( '2005-01-04' ), ( '2005-02-01' ), ( '2005-02-02' )|
+
+create procedure bug17476(pDateFormat varchar(10))
+  select date_format(t3.d, pDateFormat), count(*)
+    from t3 
+    group by date_format(t3.d, pDateFormat)|
+
+call bug17476('%Y-%m')|
+call bug17476('%Y-%m')|
+
+drop table t3|
+drop procedure bug17476|
+
+
 #
 # BUG#NNNN: New bug synopsis
 #