bk commit into 5.0 tree (msvensson:1.2002)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.2002 05/09/23 14:37:22 msvensson@neptunus.(none) +6 -0
  Merge from 4.1 to 5.0

  sql/sql_load.cc
    1.85 05/09/23 14:37:18 msvensson@neptunus.(none) +5 -2
    Manual merge

  sql/opt_sum.cc
    1.47 05/09/23 14:37:18 msvensson@neptunus.(none) +1 -0
    Add missing }

  mysql-test/t/loaddata.test
    1.14 05/09/23 14:37:18 msvensson@neptunus.(none) +1 -0
    Add drop table after test case

  mysql-test/r/union.result
    1.77 05/09/23 14:37:18 msvensson@neptunus.(none) +0 -15
    Miss in merge

  mysql-test/r/type_decimal.result
    1.36 05/09/23 14:37:18 msvensson@neptunus.(none) +3 -1
    Update warnings

  mysql-test/r/loaddata.result
    1.19 05/09/23 14:37:18 msvensson@neptunus.(none) +1 -0
    Add drop tablea after test case

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0

--- 1.46/sql/opt_sum.cc	2005-09-23 09:18:52 +02:00
+++ 1.47/sql/opt_sum.cc	2005-09-23 14:37:18 +02:00
@@ -167,6 +167,7 @@
           {
             ((Item_sum_count*) item)->make_const(count);
             recalc_const_item= 1;
+          }
         }
         else
           const_result= 0;

--- 1.84/sql/sql_load.cc	2005-09-23 09:18:52 +02:00
+++ 1.85/sql/sql_load.cc	2005-09-23 14:37:18 +02:00
@@ -677,8 +677,6 @@
       pos=read_info.row_start;
       length=(uint) (read_info.row_end-pos);
 
-      if (field == table->next_number_field)
-        table->auto_increment_field_not_null= TRUE;
       if (!read_info.enclosed &&
 	  (enclosed_length && length == 4 && !memcmp(pos,"NULL",4)) ||
 	  (length == 1 && read_info.found_null))
@@ -688,6 +686,8 @@
           Field *field= ((Item_field *)item)->field;
           field->reset();
           field->set_null();
+          if (field == table->next_number_field)
+            table->auto_increment_field_not_null= TRUE;
           if (!field->maybe_null())
           {
             if (field->type() == FIELD_TYPE_TIMESTAMP)
@@ -705,9 +705,12 @@
 
       if (item->type() == Item::FIELD_ITEM)
       {
+
         Field *field= ((Item_field *)item)->field;
         field->set_notnull();
         read_info.row_end[0]=0;			// Safe to change end marker
+        if (field == table->next_number_field)
+          table->auto_increment_field_not_null= TRUE;
         field->store((char*) pos, length, read_info.read_charset);
       }
       else

--- 1.76/mysql-test/r/union.result	2005-09-23 09:18:52 +02:00
+++ 1.77/mysql-test/r/union.result	2005-09-23 14:37:18 +02:00
@@ -780,21 +780,6 @@
   `b` longblob
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1,t2;
-create table t1 (d decimal(10,1));
-create table t2 (d decimal(10,9));
-insert into t1 values ("100000000.0");
-insert into t2 values ("1.23456780");
-create table t3 select * from t2 union select * from t1;
-select * from t3;
-d
-1.234567800
-100000000.000000000
-show create table t3;
-Table	Create Table
-t3	CREATE TABLE `t3` (
-  `d` decimal(18,9) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-drop table t1,t2,t3;
 create table t1 select 1 union select -1;
 select * from t1;
 1

--- 1.35/mysql-test/r/type_decimal.result	2005-09-23 09:18:52 +02:00
+++ 1.36/mysql-test/r/type_decimal.result	2005-09-23 14:37:18 +02:00
@@ -674,9 +674,11 @@
 drop table t1;
 create table t1(a decimal(10,5), b decimal(10,1));
 insert into t1 values(123.12345, 123.12345);
+Warnings:
+Note	1265	Data truncated for column 'b' at row 1
 update t1 set b=a;
 Warnings:
-Warning	1265	Data truncated for column 'b' at row 1
+Note	1265	Data truncated for column 'b' at row 1
 select * from t1;
 a	b
 123.12345	123.1

--- 1.18/mysql-test/r/loaddata.result	2005-09-23 09:18:52 +02:00
+++ 1.19/mysql-test/r/loaddata.result	2005-09-23 14:37:18 +02:00
@@ -76,6 +76,7 @@
 id
 0
 SET @@SQL_MODE=@OLD_SQL_MODE;
+drop table t1;
 create table t1 (a int default 100, b int, c varchar(60));
 load data infile '../../std_data/rpl_loaddata.dat' into table t1 (a, @b) set b=@b+10, c=concat("b=",@b);
 select * from t1;

--- 1.13/mysql-test/t/loaddata.test	2005-09-23 09:12:05 +02:00
+++ 1.14/mysql-test/t/loaddata.test	2005-09-23 14:37:18 +02:00
@@ -57,6 +57,7 @@
 select * from t1;
 --exec rm $MYSQL_TEST_DIR/var/tmp/t1
 SET @@SQL_MODE=@OLD_SQL_MODE;
+drop table t1;
 
 # End of 4.1 tests