after merge fix

6 files changed, 10 insertions, 9 deletions

diff --git a/heap/hp_create.c b/heap/hp_create.c
index 17aa92c9201..8fcf7dde000 100644
--- a/heap/hp_create.c
+++ b/heap/hp_create.c
@@ -168,6 +168,8 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef,
 	keyinfo->write_key= hp_write_key;
         keyinfo->hash_buckets= 0;
       }
+      if ((keyinfo->flag & HA_AUTO_KEY) && create_info->with_auto_increment)
+        share->auto_key= i + 1;
     }
     share->min_records= min_records;
     share->max_records= max_records;
diff --git a/mysql-test/r/func_gconcat.result b/mysql-test/r/func_gconcat.result
index d56a5050ced..b5ffef1c582 100644
--- a/mysql-test/r/func_gconcat.result
+++ b/mysql-test/r/func_gconcat.result
@@ -476,4 +476,3 @@ x	(select group_concat(x) from r2)
 1	1,1
 2	2,2
 drop table r2;
-
diff --git a/mysql-test/r/func_str.result b/mysql-test/r/func_str.result
index ba4de675157..15a650eccfa 100644
--- a/mysql-test/r/func_str.result
+++ b/mysql-test/r/func_str.result
@@ -692,16 +692,16 @@ drop table t1, t2;
 create table t1 (c1 INT, c2 INT UNSIGNED);
 insert into t1 values ('21474836461','21474836461');
 Warnings:
-Warning	1265	Data truncated for column 'c1' at row 1
-Warning	1265	Data truncated for column 'c2' at row 1
+Warning	1264	Out of range value adjusted for column 'c1' at row 1
+Warning	1264	Out of range value adjusted for column 'c2' at row 1
 insert into t1 values ('-21474836461','-21474836461');
 Warnings:
-Warning	1265	Data truncated for column 'c1' at row 1
-Warning	1265	Data truncated for column 'c2' at row 1
+Warning	1264	Out of range value adjusted for column 'c1' at row 1
+Warning	1264	Out of range value adjusted for column 'c2' at row 1
 show warnings;
 Level	Code	Message
-Warning	1265	Data truncated for column 'c1' at row 1
-Warning	1265	Data truncated for column 'c2' at row 1
+Warning	1264	Out of range value adjusted for column 'c1' at row 1
+Warning	1264	Out of range value adjusted for column 'c2' at row 1
 select * from t1;
 c1	c2
 2147483647	4294967295
diff --git a/sql/ha_heap.cc b/sql/ha_heap.cc
index 24f21718b8c..de51fad4365 100644
--- a/sql/ha_heap.cc
+++ b/sql/ha_heap.cc
@@ -523,7 +523,7 @@ int ha_heap::create(const char *name, TABLE *table_arg,
       }
       if (field->flags & AUTO_INCREMENT_FLAG &&
           table_arg->found_next_number_field &&
-          key == table_arg->next_number_index)
+          key == share->next_number_index)
       {
         /*
           Store key number and type for found auto_increment key
diff --git a/sql/item.h b/sql/item.h
index 31b490d6ed8..55c9af356a8 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -1291,7 +1291,6 @@ public:
     return depended_from ? OUTER_REF_TABLE_BIT : (*ref)->used_tables(); 
   }
   void set_result_field(Field *field)	{ result_field= field; }
-  Field *get_tmp_table_field() { return result_field; }
   bool is_result_field() { return 1; }
   void save_in_result_field(bool no_conversions)
   {
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 1ada220b446..c461abfc635 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -1386,6 +1386,7 @@ JOIN::exec()
 	{
 	  DBUG_VOID_RETURN;
 	}
+	curr_join->group_list= 0;
       }
       
       thd->proc_info="Copying to group table";