bk commit into 5.1 tree (gshchepa:1.2576)

[<gshchepa]

Below is the list of changes that have just been committed into a local
5.1 repository of uchum. When uchum 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, 2007-07-31 13:22:01+05:00, gshchepa@stripped +3 -0
  sql_yacc.yy, sp.result, disabled.def:
    Post-merge fix.

  mysql-test/r/sp.result@stripped, 2007-07-31 13:20:59+05:00, gshchepa@stripped +4 -4
    Post-merge fix.

  mysql-test/t/disabled.def@stripped, 2007-07-31 13:20:23+05:00, gshchepa@stripped +0 -1
    Post-merge fix.

  sql/sql_yacc.yy@stripped, 2007-07-31 13:21:34+05:00, gshchepa@stripped +1 -1
    Post-merge fix.

diff -Nrup a/mysql-test/r/sp.result b/mysql-test/r/sp.result
--- a/mysql-test/r/sp.result	2007-07-31 12:09:56 +05:00
+++ b/mysql-test/r/sp.result	2007-07-31 13:20:59 +05:00
@@ -6431,7 +6431,7 @@ select 1;
 select 3;
  select 4; 
 
-end	utf8	utf8_general_ci	latin1_swedish_ci
+end	latin1	latin1_swedish_ci	latin1_swedish_ci
 call proc_25411_a();
 1
 1
@@ -6451,7 +6451,7 @@ proc_25411_b		CREATE DEFINER=`root`@`loc
 )
 begin
 select p1, p2;
-end	utf8	utf8_general_ci	latin1_swedish_ci
+end	latin1	latin1_swedish_ci	latin1_swedish_ci
 select name, param_list, body from mysql.proc where name like "%25411%";
 name	param_list	body
 proc_25411_a		begin
@@ -6489,7 +6489,7 @@ select 1 ,2 ,3;
 select 1,2 ,3 ;
 select 1 ,2  ,3 ;
 select 1 ,2 ,3  ;
-end	utf8	utf8_general_ci	latin1_swedish_ci
+end	latin1	latin1_swedish_ci	latin1_swedish_ci
 call proc_25411_c();
 1	2	3
 1	2	3
@@ -6510,7 +6510,7 @@ select 1 /* testing */;
 show create procedure proc_26302;
 Procedure	sql_mode	Create Procedure	character_set_client	collation_connection	Database Collation
 proc_26302		CREATE DEFINER=`root`@`localhost` PROCEDURE `proc_26302`()
-select 1 /* testing */	utf8	utf8_general_ci	latin1_swedish_ci
+select 1 /* testing */	latin1	latin1_swedish_ci	latin1_swedish_ci
 select ROUTINE_NAME, ROUTINE_DEFINITION from information_schema.ROUTINES
 where ROUTINE_NAME = "proc_26302";
 ROUTINE_NAME	ROUTINE_DEFINITION
diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2007-07-30 03:19:52 +05:00
+++ b/mysql-test/t/disabled.def	2007-07-31 13:20:23 +05:00
@@ -25,4 +25,3 @@ ctype_big5               : BUG#26711 200
 
 mysql_upgrade        : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage
 federated_transactions   : Bug#29523 Transactions do not work
-ddl_i18n_koi8r           : Bug #30120 SP with local variables with non-ASCII names crashes server
diff -Nrup a/sql/sql_yacc.yy b/sql/sql_yacc.yy
--- a/sql/sql_yacc.yy	2007-07-31 12:07:19 +05:00
+++ b/sql/sql_yacc.yy	2007-07-31 13:21:34 +05:00
@@ -9506,7 +9506,7 @@ simple_ident:
             splocal= new Item_splocal($1, spv->offset, spv->type,
                                       lip->get_tok_start_prev() -
                                       lex->sphead->m_tmp_query,
-                                      lip->tok_end - lip->tok_start_prev);
+                                      lip->get_tok_end() - lip->get_tok_start_prev());
 #ifndef DBUG_OFF
             if (splocal)
               splocal->m_sp= lex->sphead;