bk commit into 5.1 tree (andrey:1.2270)

[ahristov]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey 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@stripped, 2006-08-09 17:19:39+02:00, andrey@lmy004. +4 -0
  Merge ahristov@stripped:/home/bk/mysql-5.1-runtime
  into  lmy004.:/work/mysql-5.1-runtime
  MERGE: 1.2243.2.2

  mysql-test/r/sp.result@stripped, 2006-08-09 17:19:33+02:00, andrey@lmy004. +0 -14
    manual merge
    MERGE: 1.212.1.2

  mysql-test/t/sp.test@stripped, 2006-08-09 17:19:33+02:00, andrey@lmy004. +0 -0
    manual merge
    MERGE: 1.195.1.2

  sql/sp.cc@stripped, 2006-08-09 17:11:48+02:00, andrey@lmy004. +0 -0
    Auto merged
    MERGE: 1.115.1.1

  sql/sql_yacc.yy@stripped, 2006-08-09 17:11:48+02:00, andrey@lmy004. +0 -0
    Auto merged
    MERGE: 1.489.1.1

# 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:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.1-runtime/RESYNC

--- 1.491/sql/sql_yacc.yy	2006-08-09 17:19:49 +02:00
+++ 1.492/sql/sql_yacc.yy	2006-08-09 17:19:49 +02:00
@@ -1672,6 +1672,17 @@
 	  {
 	    LEX *lex= Lex;
 	    sp_head *sp= lex->sphead;
+            /*
+              This was disabled in 5.1.12. See bug #20701
+              When collation support in SP is implemented, then this test
+              should be removed.
+            */
+            if (($8 == FIELD_TYPE_STRING || $8 == MYSQL_TYPE_VARCHAR)
+                && (lex->type & BINCMP_FLAG))
+            {
+              my_error(ER_NOT_SUPPORTED_YET, MYF(0), "return value collation");
+              YYABORT;
+            }
 
             if (sp->fill_field_definition(YYTHD, lex,
                                           (enum enum_field_types) $8,

--- 1.214/mysql-test/r/sp.result	2006-08-09 17:19:49 +02:00
+++ 1.215/mysql-test/r/sp.result	2006-08-09 17:19:49 +02:00
@@ -3625,7 +3625,6 @@
 set f1= concat( 'hello', f1 );
 return f1;
 end|
-drop function bug9048|
 drop procedure if exists bug12849_1|
 create procedure bug12849_1(inout x char) select x into x|
 set @var='a'|
@@ -4074,7 +4073,7 @@
 end|
 create table t3 (a int)|
 insert into t3 values (0)|
-create view v1 as select a from t3;
+create view v1 as select a from t3|
 create procedure bug10100pt(level int, lim int)
 begin
 if level < lim then
@@ -4095,7 +4094,7 @@
 select * from v1;
 end if;
 end|
-prepare stmt2 from "select * from t3;";
+prepare stmt2 from "select * from t3;"|
 create procedure bug10100pd(level int, lim int)
 begin
 if level < lim then
@@ -4465,7 +4464,7 @@
 Error	1347	'test.v1' is not BASE TABLE
 Error	1347	'test.v1' is not BASE TABLE
 drop procedure bug13012|
-drop view v1;
+drop view v1|
 select * from t1 order by data|
 id	data
 aa	0

--- 1.197/mysql-test/t/sp.test	2006-08-09 17:19:49 +02:00
+++ 1.198/mysql-test/t/sp.test	2006-08-09 17:19:49 +02:00
@@ -4381,12 +4381,23 @@
 --disable_warnings
 drop function if exists bug9048|
 --enable_warnings
-create function bug9048(f1 char binary) returns char binary
+create function bug9048(f1 char binary) returns char
 begin
   set f1= concat( 'hello', f1 );
   return f1;
 end|
 drop function bug9048|
+#
+# This was disabled in 5.1.12. See bug #20701
+# When collation support in SP is implemented, then this test should
+# be removed.
+#
+--error ER_NOT_SUPPORTED_YET
+create function bug9048(f1 char binary) returns char binary
+begin
+  set f1= concat( 'hello', f1 );
+  return f1;
+end|
 
 # Bug #12849 Stored Procedure: Crash on procedure call with CHAR type
 # 'INOUT' parameter
@@ -4940,7 +4951,7 @@
 # a procedure which use tables and recursion
 create table t3 (a int)|
 insert into t3 values (0)|
-create view v1 as select a from t3;
+create view v1 as select a from t3|
 create procedure bug10100pt(level int, lim int)
 begin
   if level < lim then
@@ -4963,7 +4974,7 @@
   end if;
 end|
 # dynamic sql & recursion
-prepare stmt2 from "select * from t3;";
+prepare stmt2 from "select * from t3;"|
 create procedure bug10100pd(level int, lim int)
 begin
   if level < lim then
@@ -5258,7 +5269,7 @@
 call bug13012()|
 call bug13012()|
 drop procedure bug13012|
-drop view v1;
+drop view v1|
 select * from t1 order by data|
 
 #

--- 1.116/sql/sp.cc	2006-08-09 17:19:49 +02:00
+++ 1.117/sql/sp.cc	2006-08-09 17:19:49 +02:00
@@ -1850,7 +1850,6 @@
 	      bool no_access_check, bool *dbchangedp)
 {
   int ret;
-  static char empty_c_string[1]= {0};          /* used for not defined db */
   DBUG_ENTER("sp_use_new_db");
   DBUG_PRINT("enter", ("newdb: %s", new_db.str));