bk commit into 5.0 tree (konstantin:1.1808)

[konstantin]

Below is the list of changes that have just been committed into a local
5.0 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.1808 05/03/15 16:51:35 konstantin@stripped +2 -0
  Cleanup

  sql/item_sum.cc
    1.128 05/03/15 16:51:29 konstantin@stripped +4 -4
    Cleanup

  mysql-test/t/count_distinct2.test
    1.9 05/03/15 16:51:29 konstantin@stripped +1 -1
    Cleanup

# 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:	dragonfly.local
# Root:	/media/sda1/mysql/mysql-5.0-926

--- 1.127/sql/item_sum.cc	2005-03-15 03:46:13 +03:00
+++ 1.128/sql/item_sum.cc	2005-03-15 16:51:29 +03:00
@@ -2228,14 +2228,14 @@
     return FALSE;
 
   if (!(tmp_table_param= new TMP_TABLE_PARAM))
-    return 1;
+    return TRUE;
 
   /* Create a table with an unique key over all parameters */
   for (uint i=0; i < arg_count ; i++)
   {
     Item *item=args[i];
     if (list.push_back(item))
-      return 1;					// End of memory
+      return TRUE;                              // End of memory
     if (item->const_item())
     {
       (void) item->val_int();
@@ -2244,14 +2244,14 @@
     }
   }
   if (always_null)
-    return 0;
+    return FALSE;
   count_field_types(tmp_table_param,list,0);
   DBUG_ASSERT(table == 0);
   if (!(table= create_tmp_table(thd, tmp_table_param, list, (ORDER*) 0, 1,
 				0,
 				select_lex->options | thd->options,
 				HA_POS_ERROR, (char*)"")))
-    return 1;
+    return TRUE;
   table->file->extra(HA_EXTRA_NO_ROWS);		// Don't update rows
   table->no_rows=1;
 

--- 1.8/mysql-test/t/count_distinct2.test	2003-01-06 02:48:51 +03:00
+++ 1.9/mysql-test/t/count_distinct2.test	2005-03-15 16:51:29 +03:00
@@ -64,7 +64,7 @@
 show status like 'Created_tmp_disk_tables';
 drop table t1;
 
-#test conversion from heap to MyISAM
+# Test use of MyISAM tmp tables
 create table t1 (s text);
 let $1=5000;
 disable_query_log;