bk commit into 5.0 tree (aivanov:1.2134) BUG#19727

[Alex Ivanov Notebook]

Below is the list of changes that have just been committed into a local
5.0 repository of alexi. When alexi 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.2134 06/06/06 23:37:42 aivanov@stripped +3 -0
  Applied innodb-5.0-ss609 snapshot.
   Fixed BUG#19727 "InnoDB crashed server and crashed tables
   are not recoverable".

  mysql-test/t/innodb.test
    1.133 06/06/06 23:37:38 aivanov@stripped +13 -0
    Applied innodb-5.0-ss609 snapshot.
     Add the big fat warning notice also to the bottom of
     innodb.test so that it will require more talent to
     ignore the change of policy.

  innobase/row/row0sel.c
    1.107 06/06/06 23:37:38 aivanov@stripped +2 -1
    Applied innodb-5.0-ss609 snapshot.
     row_sel_try_search_shortcut(): Do not return SEL_FOUND when
     the record was not found. This bug was introduced in
     InnoDB 5.0.3, but luckily it should nerver manifest itself,
     given that existing InnoDB SQL code never makes use of
     consistent reads.

  innobase/row/row0mysql.c
    1.121 06/06/06 23:37:38 aivanov@stripped +10 -10
    Applied innodb-5.0-ss609 snapshot.
     Move trx_commit_for_mysql(trx) calls before calls to
     row_mysql_unlock_data_dictionary(trx).

# 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:	aivanov
# Host:	mysqld.localdomain
# Root:	/home/alexi/innodb/mysql-5.0-ss609

--- 1.120/innobase/row/row0mysql.c	2006-06-06 23:08:07 +04:00
+++ 1.121/innobase/row/row0mysql.c	2006-06-06 23:37:38 +04:00
@@ -2570,14 +2570,14 @@
 		}
 	}
 funct_exit:	
+  	trx_commit_for_mysql(trx);
+
 	row_mysql_unlock_data_dictionary(trx);
 
 	if (graph) {
 		que_graph_free(graph);
 	}
 
-  	trx_commit_for_mysql(trx);
-
 	trx->op_info = "";
 
 	return((int) err);
@@ -2707,10 +2707,10 @@
 	}
 
 funct_exit:	
-	row_mysql_unlock_data_dictionary(trx);
-
   	trx_commit_for_mysql(trx);
 
+	row_mysql_unlock_data_dictionary(trx);
+
 	trx->op_info = "";
 
 	return((int) err);
@@ -3398,6 +3398,8 @@
 	}
 funct_exit:
 
+  	trx_commit_for_mysql(trx);
+
 	if (locked_dictionary) {
 		row_mysql_unlock_data_dictionary(trx);	
 	}
@@ -3408,8 +3410,6 @@
 
 	que_graph_free(graph);
 	
-  	trx_commit_for_mysql(trx);
-
 	trx->op_info = "";
 
 #ifndef UNIV_HOTBACKUP
@@ -3488,10 +3488,10 @@
 		}
 	}
 
-	row_mysql_unlock_data_dictionary(trx);
-	
 	trx_commit_for_mysql(trx);
 
+	row_mysql_unlock_data_dictionary(trx);
+	
 	trx->op_info = "";
 
 	return(err);
@@ -3905,6 +3905,8 @@
 		}
 	}
 funct_exit:	
+  	trx_commit_for_mysql(trx);
+
 	if (!recovering_temp_table) {
 		row_mysql_unlock_data_dictionary(trx);
 	}
@@ -3917,8 +3919,6 @@
 		mem_heap_free(heap);
 	}
 	
-  	trx_commit_for_mysql(trx);
-
 	trx->op_info = "";
 
 	return((int) err);

--- 1.106/innobase/row/row0sel.c	2006-03-29 23:04:27 +04:00
+++ 1.107/innobase/row/row0sel.c	2006-06-06 23:37:38 +04:00
@@ -1064,11 +1064,12 @@
 	ut_ad(plan->pcur.latch_mode == node->latch_mode);
 
 	plan->n_rows_fetched++;
+	ret = SEL_FOUND;
 func_exit:
 	if (UNIV_LIKELY_NULL(heap)) {
 		mem_heap_free(heap);
 	}
-	return(SEL_FOUND);
+	return(ret);
 }
 
 /*************************************************************************

--- 1.132/mysql-test/t/innodb.test	2006-05-03 18:01:23 +04:00
+++ 1.133/mysql-test/t/innodb.test	2006-06-06 23:37:38 +04:00
@@ -2196,3 +2196,16 @@
 #
 --error ER_TABLE_CANT_HANDLE_SPKEYS
 create table t1 (g geometry not null, spatial gk(g)) engine=innodb;
+
+#######################################################################
+#                                                                     #
+# Please, DO NOT TOUCH this file as well as the innodb.result file.   #
+# These files are to be modified ONLY BY INNOBASE guys.               #
+#                                                                     #
+# Use innodb_mysql.[test|result] files instead.                       #
+#                                                                     #
+# If nevertheless you need to make some changes here, please, forward #
+# your commit message To: dev@stripped Cc: dev-innodb@stripped     #
+# (otherwise your changes may be erased).                             #
+#                                                                     #
+#######################################################################