mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-27586 Auto-increment does not work with DESC on MERGE table

Browse source 
also fix handler::get_auto_increment()
This commit is contained in:
Sergei Golubchik 2022-01-24 21:26:07 +01:00
parent 72b5b8b2e3
commit d751f42a02
3 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
mysql-test/main/merge.result
View file

@ -3913,5 +3913,19 @@ select * from tm;
ERROR HY000: Unable to open underlying table which is differently defined or of non-MyISAM type or doesn't exist
drop table tm, t;
#
# MDEV-27586 Auto-increment does not work with DESC on MERGE table
#
create table t (a int not null, primary key(a desc)) engine=myisam;
create table tm (a int not null auto_increment, primary key(a desc)) engine=merge union=(t) insert_method=first;
insert into tm () values ();
insert into tm () values ();
insert into tm () values ();
select * from tm;
a
3
2
1
drop table tm, t;
#
# End of 10.8 tests
#

11
mysql-test/main/merge.test
View file

@ -2872,6 +2872,17 @@ create table tm (a int, key(a)) engine=merge union(t);
select * from tm;
drop table tm, t;
--echo #
--echo # MDEV-27586 Auto-increment does not work with DESC on MERGE table
--echo #
create table t (a int not null, primary key(a desc)) engine=myisam;
create table tm (a int not null auto_increment, primary key(a desc)) engine=merge union=(t) insert_method=first;
insert into tm () values ();
insert into tm () values ();
insert into tm () values ();
select * from tm;
drop table tm, t;
--echo #
--echo # End of 10.8 tests
--echo #

11
sql/handler.cc
View file

@ -4112,6 +4112,9 @@ void handler::get_auto_increment(ulonglong offset, ulonglong increment,
int error;
MY_BITMAP *old_read_set;
bool rnd_inited= (inited == RND);
bool rev= table->key_info[table->s->next_number_index].
key_part[table->s->next_number_keypart].key_part_flag &
HA_REVERSE_SORT;
if (rnd_inited && ha_rnd_end())
return;
@ -4133,7 +4136,8 @@ void handler::get_auto_increment(ulonglong offset, ulonglong increment,
if (table->s->next_number_keypart == 0)
{ // Autoincrement at key-start
error= ha_index_last(table->record[1]);
error= rev ? ha_index_first(table->record[1])
: ha_index_last(table->record[1]);
/*
MySQL implicitly assumes such method does locking (as MySQL decides to
use nr+increment without checking again with the handler, in
@ -4148,9 +4152,8 @@ void handler::get_auto_increment(ulonglong offset, ulonglong increment,
table->key_info + table->s->next_number_index,
table->s->next_number_key_offset);
error= ha_index_read_map(table->record[1], key,
make_prev_keypart_map(table->s->
next_number_keypart),
HA_READ_PREFIX_LAST);
make_prev_keypart_map(table->s->next_number_keypart),
rev ? HA_READ_KEY_EXACT : HA_READ_PREFIX_LAST);
/*
MySQL needs to call us for next row: assume we are inserting ("a",null)
here, we return 3, and next this statement will want to insert