diff options
| author | unknown <iggy@recycle.(none)> | 2007-03-29 10:42:03 -0400 |
|---|---|---|
| committer | unknown <iggy@recycle.(none)> | 2007-03-29 10:42:03 -0400 |
| commit | 1edf36853b8ce2c4a3e5a3b2676445baef60b50f (patch) | |
| tree | e03c95e78f3d23c4b7429b3b50374f9a08f7eea6 /mysql-test/r/sp-code.result | |
| parent | 9e6d54e4a5ddf0aae5b23a9b51507e7bb6b5d5f5 (diff) | |
| parent | 609277f942e5479976d5a1f31da55fd2cf646109 (diff) | |
| download | mariadb-git-1edf36853b8ce2c4a3e5a3b2676445baef60b50f.tar.gz | |
Merge recycle.(none):/src/bug23491/my50-bug23491
into recycle.(none):/src/bug23491/my51-bug23491
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
sql/item_func.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.h:
Auto merged
mysql-test/r/mysqldump.result:
Manual Merge.
sql/sql_yacc.yy:
Manual Merge.
Diffstat (limited to 'mysql-test/r/sp-code.result')
| -rw-r--r-- | mysql-test/r/sp-code.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/sp-code.result b/mysql-test/r/sp-code.result index 67b030f87a4..9d86a6bc08d 100644 --- a/mysql-test/r/sp-code.result +++ b/mysql-test/r/sp-code.result @@ -187,7 +187,7 @@ Pos Instruction 32 set v_dig@4 (v_dig@4 + 1) 33 stmt 4 "update sudoku_work set dig = v_dig wh..." 34 set v_tcounter@6 (v_tcounter@6 + 1) -35 jump_if_not 37(37) (not(`test`.`sudoku_digit_ok`(v_row@7,v_col@8,v_dig@4))) +35 jump_if_not 37(37) (not(`sudoku_digit_ok`(v_row@7,v_col@8,v_dig@4))) 36 jump 15 37 set v_i@3 (v_i@3 + 1) 38 jump 15 |