bk commit into 5.1 tree (msvensson:1.2110) BUG#17360

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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.2110 06/02/15 14:12:36 msvensson@stripped +2 -0
  Bug#17360 sp-code test case broken
   - Change 94 to 95 according to Pem's instructions in bug report.

  mysql-test/t/disabled.def
    1.69 06/02/15 14:12:28 msvensson@stripped +0 -1
    Enable sp-code test case

  mysql-test/r/sp-code.result
    1.7 06/02/15 14:12:28 msvensson@stripped +2 -2
    Update from 94 to 95 according to Pem's instructions

# 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:	msvensson
# Host:	devsrv-b.mysql.com
# Root:	/space/magnus/bug17360/my51-bug17360

--- 1.68/mysql-test/t/disabled.def	2006-02-14 19:46:41 +01:00
+++ 1.69/mysql-test/t/disabled.def	2006-02-15 14:12:28 +01:00
@@ -33,7 +33,6 @@
 sp-goto              : GOTO is currently is disabled - will be fixed in the future
 subselect            : Bug#15706 (ps mode) [PATCH PENDING]
 rpl_ndb_log          : result not deterministic
-sp-code              : Bug #17360
 binlog_row_mix_innodb_myisam : Bug #17386
 binlog_row_insert_select : Bug #17385
 rpl_row_basic_2myisam : Bug #17385

--- 1.6/mysql-test/r/sp-code.result	2006-02-09 11:34:34 +01:00
+++ 1.7/mysql-test/r/sp-code.result	2006-02-15 14:12:28 +01:00
@@ -155,11 +155,11 @@
 0	stmt 9 "drop temporary table if exists sudoku..."
 1	stmt 1 "create temporary table sudoku_work ( ..."
 2	stmt 1 "create temporary table sudoku_schedul..."
-3	stmt 94 "call sudoku_init("
+3	stmt 95 "call sudoku_init("
 4	jump_if_not 7(8) p_naive@0
 5	stmt 4 "update sudoku_work set cnt = 0 where ..."
 6	jump 8
-7	stmt 94 "call sudoku_count("
+7	stmt 95 "call sudoku_count("
 8	stmt 6 "insert into sudoku_schedule (row,col)..."
 9	set v_scounter@2 0
 10	set v_i@3 1