database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

after merge fix

Browse Source
This commit is contained in:
unknown
2005-03-17 18:44:24 +03:00
parent 17791f9500
commit 0c0a2d5590
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
heap/hp_create.c
View File

@ -168,6 +168,8 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef,
keyinfo->write_key= hp_write_key; keyinfo->write_key= hp_write_key;
keyinfo->hash_buckets= 0; 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->min_records= min_records;
share->max_records= max_records; share->max_records= max_records;

1
mysql-test/r/func_gconcat.result
View File

@ -476,4 +476,3 @@ x (select group_concat(x) from r2)
1 1,1 1 1,1
2 2,2 2 2,2
drop table r2; drop table r2;

12
mysql-test/r/func_str.result
View File

@ -692,16 +692,16 @@ drop table t1, t2;
create table t1 (c1 INT, c2 INT UNSIGNED); create table t1 (c1 INT, c2 INT UNSIGNED);
insert into t1 values ('21474836461','21474836461'); insert into t1 values ('21474836461','21474836461');
Warnings: Warnings:
Warning 1265 Data truncated for column 'c1' at row 1 Warning 1264 Out of range value adjusted 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 'c2' at row 1
insert into t1 values ('-21474836461','-21474836461'); insert into t1 values ('-21474836461','-21474836461');
Warnings: Warnings:
Warning 1265 Data truncated for column 'c1' at row 1 Warning 1264 Out of range value adjusted 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 'c2' at row 1
show warnings; show warnings;
Level Code Message Level Code Message
Warning 1265 Data truncated for column 'c1' at row 1 Warning 1264 Out of range value adjusted 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 'c2' at row 1
select * from t1; select * from t1;
c1 c2 c1 c2
2147483647 4294967295 2147483647 4294967295

2
sql/ha_heap.cc
View File

@ -523,7 +523,7 @@ int ha_heap::create(const char *name, TABLE *table_arg,
} }
if (field->flags & AUTO_INCREMENT_FLAG && if (field->flags & AUTO_INCREMENT_FLAG &&
table_arg->found_next_number_field && 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 Store key number and type for found auto_increment key

1
sql/item.h
View File

@ -1291,7 +1291,6 @@ public:
return depended_from ? OUTER_REF_TABLE_BIT : (*ref)->used_tables(); return depended_from ? OUTER_REF_TABLE_BIT : (*ref)->used_tables();
} }
void set_result_field(Field *field) { result_field= field; } void set_result_field(Field *field) { result_field= field; }
Field *get_tmp_table_field() { return result_field; }
bool is_result_field() { return 1; } bool is_result_field() { return 1; }
void save_in_result_field(bool no_conversions) void save_in_result_field(bool no_conversions)
{ {

1
sql/sql_select.cc
View File

@ -1386,6 +1386,7 @@ JOIN::exec()
{ {
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
curr_join->group_list= 0;
} }
thd->proc_info="Copying to group table"; thd->proc_info="Copying to group table";