diff options
| author | unknown <gluh@eagle.(none)> | 2007-01-24 19:54:40 +0400 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-01-24 19:54:40 +0400 |
| commit | d663a34303e600a5e33c6b1ca27fb3e9b1f4646e (patch) | |
| tree | f775cabca54ceb5c24dfb0a8166ff2a9d78c7644 /mysql-test/r/sp-code.result | |
| parent | 1b71102f4bc56181e7781e0367bb6f44876a4553 (diff) | |
| parent | 19ce865686ec43780d14ca43aa0d516bf5b36c8b (diff) | |
| download | mariadb-git-d663a34303e600a5e33c6b1ca27fb3e9b1f4646e.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
BitKeeper/etc/ignore:
auto-union
mysql-test/r/func_in.result:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/sp-code.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/func_in.test:
Auto merged
mysql-test/t/range.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/select.result:
manual merge
mysql-test/r/view.result:
manual merge
mysql-test/t/select.test:
manual merge
mysql-test/t/view.test:
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 0b0ad802b54..67b030f87a4 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(`test`.`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 |