summaryrefslogtreecommitdiff
path: root/mysql-test/include/mix1.inc
diff options
context:
space:
mode:
authorunknown <ramil/ram@ramil.myoffice.izhnet.ru>2007-07-20 10:30:40 +0500
committerunknown <ramil/ram@ramil.myoffice.izhnet.ru>2007-07-20 10:30:40 +0500
commitdae4ffda3e6cd1e9df0fbd1aa0dd0457eafeee51 (patch)
treedbe0aefa38c58605fb3672b192136b213c1e2b61 /mysql-test/include/mix1.inc
parent33f6bd0b72e4575ea571d364cb0f8203b8b6bc82 (diff)
parent6947f2d1316c7b0b7ede841a097328da8c21aa4d (diff)
downloadmariadb-git-dae4ffda3e6cd1e9df0fbd1aa0dd0457eafeee51.tar.gz
Merge mysql.com:/home/ram/work/b28125/b28125.5.0
into mysql.com:/home/ram/work/b28125/b28125.5.1 sql/sql_table.cc: Auto merged mysql-test/include/mix1.inc: manual merge
Diffstat (limited to 'mysql-test/include/mix1.inc')
-rw-r--r--mysql-test/include/mix1.inc11
1 files changed, 9 insertions, 2 deletions
diff --git a/mysql-test/include/mix1.inc b/mysql-test/include/mix1.inc
index c032aaea50e..221c114cd95 100644
--- a/mysql-test/include/mix1.inc
+++ b/mysql-test/include/mix1.inc
@@ -814,8 +814,16 @@ create table t1 (a int) engine=innodb;
alter table t1 alter a set default 1;
drop table t1;
---echo End of 5.0 tests
+#
+# Bug #28125: ERROR 2013 when adding index.
+#
+create table t1(a text) engine=innodb default charset=utf8;
+insert into t1 values('aaa');
+alter table t1 add index(a(1024));
+show create table t1;
+drop table t1;
+--echo End of 5.0 tests
# Fix for BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY
# UPDATE": if the row is updated, it's like a regular UPDATE:
@@ -917,5 +925,4 @@ unlock tables;
select * from t1;
drop tables t1;
-
--echo End of 5.1 tests