diff options
| author | unknown <konstantin@mysql.com> | 2006-02-08 15:03:09 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-02-08 15:03:09 +0300 |
| commit | c02246c461007ae32297a43c2dca90c0ad909dab (patch) | |
| tree | 7528c2faf9d9bea5bb2eb350e595ccb220e5c809 /mysql-test/r/sp-code.result | |
| parent | fa86430f2870c7609bb659598ce269aeefa288fa (diff) | |
| download | mariadb-git-c02246c461007ae32297a43c2dca90c0ad909dab.tar.gz | |
Post merge-fixes.
Apply a patch by Jonas for NDB diskdata.
mysql-test/r/sp-code.result:
Fix a test result after merge: 94 and 95 are SQLCOM codes of
SQLCOM_CALL. New commands were added in 5.1 so SQLCOM_CALL got
renumbered.
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Apply second patch by Jonas to make NDB diskdata work on systems
without O_DIRECT support.
Diffstat (limited to 'mysql-test/r/sp-code.result')
| -rw-r--r-- | mysql-test/r/sp-code.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/sp-code.result b/mysql-test/r/sp-code.result index c9fe170dda6..bb0adae6bab 100644 --- a/mysql-test/r/sp-code.result +++ b/mysql-test/r/sp-code.result @@ -155,11 +155,11 @@ Pos Instruction 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 95 "call sudoku_init(" +3 stmt 94 "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 95 "call sudoku_count(" +7 stmt 94 "call sudoku_count(" 8 stmt 6 "insert into sudoku_schedule (row,col)..." 9 set v_scounter@2 0 10 set v_i@3 1 |