1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automatic merge

Browse Source
This commit is contained in:
Michael Widenius 2011-06-27 12:48:53 +03:00
commit 2cfbfbac13
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite/maria/r/maria.result
View File

@ -22,6 +22,17 @@ CHECK TABLE t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check status OK test.t1 check status OK
drop table t1; drop table t1;
create table t1 (a int primary key auto_increment) engine=aria;
insert into t1 values (1);
update t1 set a=0 where a=1;
check table t1;
Table Op Msg_type Msg_text
test.t1 check warning Found row where the auto_increment column has the value 0
test.t1 check status OK
select * from t1;
a
0
drop table t1;
create table t1 (a tinyint not null auto_increment, b blob not null, primary key (a)); create table t1 (a tinyint not null auto_increment, b blob not null, primary key (a));
check table t1; check table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text

10
mysql-test/suite/maria/t/maria.test
View File

@ -41,6 +41,16 @@ INSERT INTO t1 VALUES ('WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW
CHECK TABLE t1; CHECK TABLE t1;
drop table t1; drop table t1;
#
# Test auto_increment warning
#
create table t1 (a int primary key auto_increment) engine=aria;
insert into t1 values (1);
update t1 set a=0 where a=1;
check table t1;
select * from t1;
drop table t1;
# #
# Test problem with rows that are 65517-65520 bytes long # Test problem with rows that are 65517-65520 bytes long
# #

1
sql/mysqld.cc
View File

@ -3274,6 +3274,7 @@ const char *load_default_groups[]= {
#endif #endif
"mysqld", "server", MYSQL_BASE_VERSION, "mysqld", "server", MYSQL_BASE_VERSION,
"mariadb", MARIADB_BASE_VERSION, "mariadb", MARIADB_BASE_VERSION,
"client-server",
0, 0}; 0, 0};
#if defined(__WIN__) && !defined(EMBEDDED_LIBRARY) #if defined(__WIN__) && !defined(EMBEDDED_LIBRARY)