mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
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.
This commit is contained in:
@ -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
|
||||
|
Reference in New Issue
Block a user