Commit 0c0a2d55 authored by unknown's avatar unknown
Browse files

after merge fix

parent 17791f95

heap/hp_create.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

mysql-test/r/func_gconcat.result

+0 −1
Original line number Diff line number Diff line
@@ -476,4 +476,3 @@ x (select group_concat(x) from r2) 
1	1,1

2	2,2

drop table r2;

mysql-test/r/func_str.result

+6 −6
Original line number Diff line number Diff line
@@ -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

sql/ha_heap.cc

+1 −1
Original line number Diff line number Diff line
@@ -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

sql/item.h

+0 −1
Original line number Diff line number Diff line
@@ -1291,7 +1291,6 @@ class Item_ref :public Item_ident 
    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)

  {