bk commit into 5.1 tree (konstantin:1.2095)

[Konstantin Osipov]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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.2095 06/02/08 15:03:09 konstantin@stripped +2 -0
  Post merge-fixes.
  Apply a patch by Jonas for NDB diskdata.

  storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
    1.28 06/02/08 15:02:53 konstantin@stripped +2 -1
    Apply second patch by Jonas to make NDB diskdata work on systems
    without O_DIRECT support.

  mysql-test/r/sp-code.result
    1.5 06/02/08 15:02:53 konstantin@stripped +2 -2
    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.

# 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:	konstantin
# Host:	oak.local
# Root:	/home/kostja/mysql/mysql-5.1-merge

--- 1.27/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2006-02-08 13:05:01 +03:00
+++ 1.28/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2006-02-08 15:02:53 +03:00
@@ -431,6 +431,7 @@
 
       m_fs.EXECUTE_DIRECT(block, GSN_FSWRITEREQ, signal, 
 			  FsReadWriteReq::FixedLength + 1);
+  retry:
       Uint32 size = request->par.open.page_size;
       char* buf = (char*)m_page_ptr.p;
       while(size > 0){
@@ -457,7 +458,7 @@
 	  close(theFd);
 	  theFd = ::open(theFileName.c_str(), new_flags, mode);
 	  if (theFd != -1)
-	    continue;
+	    goto retry;
 	}
 #endif
 	close(theFd);

--- 1.4/mysql-test/r/sp-code.result	2006-01-25 17:11:44 +03:00
+++ 1.5/mysql-test/r/sp-code.result	2006-02-08 15:02:53 +03: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 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