Merge with 4.0.13

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BUILD/SETUP.sh:
  Auto merged
BitKeeper/deleted/.del-libmysql.def~29fc6d70335f1c4c:
  Auto merged
Makefile.am:
  Auto merged
acinclude.m4:
  Auto merged
BitKeeper/triggers/post-commit:
  Auto merged
Build-tools/Do-compile:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/config-win.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/violite.h:
  Auto merged
innobase/buf/buf0flu.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/include/buf0buf.h:
  Auto merged
innobase/include/buf0lru.h:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0log.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_key.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_range.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/delete.result:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/innodb_handler.result:
  Auto merged
mysql-test/r/join.result:
  Auto merged
mysql-test/r/join_outer.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/multi_update.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/alter_table.test:
  Auto merged
mysql-test/t/ctype_latin1_de.test:
  Auto merged
mysql-test/t/delete.test:
  Auto merged
mysql-test/t/fulltext.test:
  Auto merged
mysql-test/t/innodb_handler.test:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysql-test/t/join_outer.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/multi_update.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/repair.test:
  Auto merged
mysql-test/t/select_safe.test:
  Auto merged
mysql-test/t/type_decimal.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
scripts/mysql_fix_privilege_tables.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/ha_heap.h:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/init.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_list.h:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/unireg.h:
  Auto merged
sql-bench/crash-me.sh:
  Auto merged
sql-bench/test-transactions.sh:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
tests/grant.res:
  Auto merged
sql/log_event.cc:
  Merge with 4.0.13
  Cleaned up comment syntax

1 files changed, 54 insertions, 25 deletions

diff --git a/sql/opt_sum.cc b/sql/opt_sum.cc
index 1e116518da0..b96c6383bbb 100644
--- a/sql/opt_sum.cc
+++ b/sql/opt_sum.cc
@@ -69,8 +69,10 @@ static int maxmin_in_range(bool max_fl, Field* field, COND *cond);
 
   RETURN VALUES
     0 No errors
-    1 if all items was resolved
-   -1 on impossible  conditions
+    1 if all items were resolved
+   -1 on impossible conditions
+    OR an error number from my_base.h HA_ERR_... if a deadlock or a lock
+       wait timeout happens, for example
 */
 
 int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
@@ -82,6 +84,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
   table_map where_tables= 0;
   Item *item;
   COND *org_conds= conds;
+  int error;
 
   if (conds)
     where_tables= conds->used_tables();
@@ -131,7 +134,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
             if (outer_tables || (table->table->file->table_flags() &
                                  HA_NOT_EXACT_COUNT))
             {
-              const_result= 0;                        // Can't optimize left join
+              const_result= 0;			// Can't optimize left join
               break;
             }
             tables->table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
@@ -164,6 +167,11 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
           Item_field *item_field= ((Item_field*) expr);
           TABLE *table= item_field->field->table;
 
+	  if ((table->file->table_flags() & HA_NOT_READ_AFTER_KEY))
+	  {
+	    const_result=0;
+	    break;
+	  }
           /* 
             Look for a partial key that can be used for optimization.
             If we succeed, ref.key_length will contain the length of
@@ -179,18 +187,21 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
             const_result= 0;
             break;
           }
-          bool error= table->file->index_init((uint) ref.key);
+          error= table->file->index_init((uint) ref.key);
 
           if (!ref.key_length)
-            error= table->file->index_first(table->record[0]) != 0;
+            error= table->file->index_first(table->record[0]);
           else
-	        error= table->file->index_read(table->record[0],key_buff,
-					                       ref.key_length,
-					                       range_fl & NEAR_MIN ?
-					                       HA_READ_AFTER_KEY :
-					                       HA_READ_KEY_OR_NEXT) ||
-                   reckey_in_range(0, &ref, item_field->field, 
-                                   conds, range_fl, prefix_len); 
+	  {
+	    error= table->file->index_read(table->record[0],key_buff,
+					   ref.key_length,
+					   range_fl & NEAR_MIN ?
+					   HA_READ_AFTER_KEY :
+					   HA_READ_KEY_OR_NEXT);
+	    if (!error && reckey_in_range(0, &ref, item_field->field, 
+					  conds, range_fl, prefix_len))
+	      error= HA_ERR_KEY_NOT_FOUND;
+	  }
           if (table->key_read)
           {
             table->key_read= 0;
@@ -198,10 +209,16 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
           }
           table->file->index_end();
           if (error)
-            return -1;                                // No rows matching where
+	  {
+	    if (error == HA_ERR_KEY_NOT_FOUND || error == HA_ERR_END_OF_FILE)
+	      return -1;		       // No rows matching WHERE
+	    /* HA_ERR_LOCK_DEADLOCK or some other error */
+ 	    table->file->print_error(error, MYF(0));
+            return(error);
+	  }
           removed_tables|= table->map;
         }
-        else if (!expr->const_item())                // This is VERY seldom false
+        else if (!expr->const_item())		// This is VERY seldom false
         {
           const_result= 0;
           break;
@@ -249,18 +266,20 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
             const_result= 0;
             break;
           }
-          bool error= table->file->index_init((uint) ref.key);
+          error= table->file->index_init((uint) ref.key);
 
           if (!ref.key_length)
-            error=table->file->index_last(table->record[0]) != 0;
+            error= table->file->index_last(table->record[0]);
           else
-	        error= table->file->index_read(table->record[0], key_buff,
-					                       ref.key_length,
-					                       range_fl & NEAR_MAX ?
-					                       HA_READ_BEFORE_KEY :
-					                       HA_READ_PREFIX_LAST_OR_PREV) ||
-                   reckey_in_range(1, &ref, item_field->field, 
-                                   conds, range_fl, prefix_len); 
+	  {
+	    error= table->file->index_read(table->record[0], key_buff,
+					   ref.key_length,
+					   range_fl & NEAR_MAX ?
+					   HA_READ_BEFORE_KEY :
+					   HA_READ_PREFIX_LAST_OR_PREV);
+	    if (!error && reckey_in_range(1, &ref, item_field->field, 
+					  conds, range_fl, prefix_len))
+	      error= HA_ERR_KEY_NOT_FOUND;
           if (table->key_read)
           {
             table->key_read=0;
@@ -268,10 +287,16 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
           }
           table->file->index_end();
           if (error)
-            return -1;                                // Impossible query
+          {
+	    if (error == HA_ERR_KEY_NOT_FOUND || error == HA_ERR_END_OF_FILE)
+	      return -1;		       // No rows matching WHERE
+	    /* HA_ERR_LOCK_DEADLOCK or some other error */
+ 	    table->file->print_error(error, MYF(0));
+            return(error);
+	  }
           removed_tables|= table->map;
         }
-        else if (!expr->const_item())                // This is VERY seldom false
+        else if (!expr->const_item())		// This is VERY seldom false
         {
           const_result= 0;
           break;
@@ -597,6 +622,10 @@ static bool matching_cond(bool max_fl, TABLE_REF *ref, KEY *keyinfo,
      (if we have a condition field = const, prefix_len contains the length
       of the whole search key)
 
+  NOTE
+   This function may set table->key_read to 1, which must be reset after
+   index is used! (This can only happen when function returns 1)
+
   RETURN
     0   Index can not be used to optimize MIN(field)/MAX(field)
     1   Can use key to optimize MIN()/MAX()