3477 Jon Olav Hauglid 2012-02-01
WL#5534 Online ALTER, Phase 1.
Patch #82:
- Updated two result files with changes in
behavior from patch#80 (no longer duplicated warnings)
- Fixed typo in comment.
modified:
mysql-test/suite/innodb/r/innodb_index_large_prefix_4k.result
mysql-test/suite/innodb/r/innodb_index_large_prefix_8k.result
sql/sql_table.cc
3476 Dmitry Lenev 2012-02-01
WL#5534 Online ALTER, Phase 1.
Patch #82:
Made HA_CREATE_INFO and Alter_info part of
Alter_inplace_info. Documented their state.
modified:
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.cc
sql/handler.h
sql/sql_table.cc
=== modified file 'mysql-test/suite/innodb/r/innodb_index_large_prefix_4k.result'
--- a/mysql-test/suite/innodb/r/innodb_index_large_prefix_4k.result 2011-11-20 21:00:25 +0000
+++ b/mysql-test/suite/innodb/r/innodb_index_large_prefix_4k.result 2012-02-01 07:50:40 +0000
@@ -11,11 +11,9 @@ update worklog5743 set a = (repeat("b",
create index idx on worklog5743(a(900));
Warnings:
Warning 1071 Specified key was too long; max key length is 768 bytes
-Warning 1071 Specified key was too long; max key length is 768 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 768 bytes
-Warning 1071 Specified key was too long; max key length is 768 bytes
begin;
update worklog5743 set a = (repeat("x", 17000));
select @@session.tx_isolation;
@@ -96,7 +94,6 @@ ERROR HY000: Too big row
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
Error 139 Too big row
Error 1118 Row size too large. The maximum row size for the used table type, not counting BLOBs, is 1982. You have to change some columns to TEXT or BLOBs
Error 1030 Got error 139 from storage engine
@@ -124,11 +121,9 @@ set global innodb_large_prefix=1;
create index idx1 on worklog5743_2(a2(4000));
Warnings:
Warning 1071 Specified key was too long; max key length is 768 bytes
-Warning 1071 Specified key was too long; max key length is 768 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 768 bytes
-Warning 1071 Specified key was too long; max key length is 768 bytes
show create table worklog5743_2;
Table Create Table
worklog5743_2 CREATE TABLE `worklog5743_2` (
@@ -139,11 +134,9 @@ worklog5743_2 CREATE TABLE `worklog5743_
create index idx3 on worklog5743_2(a2(769));
Warnings:
Warning 1071 Specified key was too long; max key length is 768 bytes
-Warning 1071 Specified key was too long; max key length is 768 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 768 bytes
-Warning 1071 Specified key was too long; max key length is 768 bytes
create index idx4 on worklog5743_2(a2(768));
show warnings;
Level Code Message
@@ -159,11 +152,9 @@ set global innodb_large_prefix=0;
create index idx1 on worklog5743_4(a2(4000));
Warnings:
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
show create table worklog5743_4;
Table Create Table
worklog5743_4 CREATE TABLE `worklog5743_4` (
@@ -174,19 +165,15 @@ worklog5743_4 CREATE TABLE `worklog5743_
create index idx3 on worklog5743_4(a2(769));
Warnings:
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
create index idx4 on worklog5743_4(a2(768));
Warnings:
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
create index idx5 on worklog5743_4(a1, a2(765));
ERROR 42000: Specified key was too long; max key length is 768 bytes
show warnings;
@@ -359,11 +346,9 @@ create table worklog5743(a TEXT not null
create index idx1 on worklog5743(a(769));
Warnings:
Warning 1071 Specified key was too long; max key length is 768 bytes
-Warning 1071 Specified key was too long; max key length is 768 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 768 bytes
-Warning 1071 Specified key was too long; max key length is 768 bytes
create index idx2 on worklog5743(a(768));
show warnings;
Level Code Message
=== modified file 'mysql-test/suite/innodb/r/innodb_index_large_prefix_8k.result'
--- a/mysql-test/suite/innodb/r/innodb_index_large_prefix_8k.result 2011-11-20 21:00:25 +0000
+++ b/mysql-test/suite/innodb/r/innodb_index_large_prefix_8k.result 2012-02-01 07:50:40 +0000
@@ -11,11 +11,9 @@ update worklog5743 set a = (repeat("b",
create index idx on worklog5743(a(2000));
Warnings:
Warning 1071 Specified key was too long; max key length is 1536 bytes
-Warning 1071 Specified key was too long; max key length is 1536 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 1536 bytes
-Warning 1071 Specified key was too long; max key length is 1536 bytes
begin;
update worklog5743 set a = (repeat("x", 17000));
select @@session.tx_isolation;
@@ -97,7 +95,6 @@ ERROR HY000: Too big row
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
Error 139 Too big row
Error 1118 Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. You have to change some columns to TEXT or BLOBs
Error 1030 Got error 139 from storage engine
@@ -107,7 +104,6 @@ ERROR HY000: Too big row
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 1536 bytes
-Warning 1071 Specified key was too long; max key length is 1536 bytes
Error 139 Too big row
Error 1118 Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. You have to change some columns to TEXT or BLOBs
Error 1030 Got error 139 from storage engine
@@ -135,18 +131,15 @@ set global innodb_large_prefix=0;
create index idx1 on worklog5743_2(a2(4000));
Warnings:
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
set global innodb_large_prefix=1;
create index idx2 on worklog5743_2(a2(4000));
ERROR HY000: Too big row
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 1536 bytes
-Warning 1071 Specified key was too long; max key length is 1536 bytes
Error 139 Too big row
Error 1118 Row size too large. The maximum row size for the used table type, not counting BLOBs, is 4030. You have to change some columns to TEXT or BLOBs
Error 1030 Got error 139 from storage engine
@@ -174,20 +167,16 @@ set global innodb_large_prefix=0;
create index idx1 on worklog5743_4(a2(4000));
Warnings:
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
set global innodb_large_prefix=1;
create index idx3 on worklog5743_4(a2(1537));
Warnings:
Warning 1071 Specified key was too long; max key length is 1536 bytes
-Warning 1071 Specified key was too long; max key length is 1536 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 1536 bytes
-Warning 1071 Specified key was too long; max key length is 1536 bytes
create index idx4 on worklog5743_4(a2(1536));
show warnings;
Level Code Message
@@ -203,28 +192,22 @@ set global innodb_large_prefix=0;
create index idx1 on worklog5743_8(a2(1000));
Warnings:
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 767 bytes
-Warning 1071 Specified key was too long; max key length is 767 bytes
set global innodb_large_prefix=1;
create index idx2 on worklog5743_8(a2(3073));
Warnings:
Warning 1071 Specified key was too long; max key length is 1536 bytes
-Warning 1071 Specified key was too long; max key length is 1536 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 1536 bytes
-Warning 1071 Specified key was too long; max key length is 1536 bytes
create index idx3 on worklog5743_8(a2(3072));
Warnings:
Warning 1071 Specified key was too long; max key length is 1536 bytes
-Warning 1071 Specified key was too long; max key length is 1536 bytes
show warnings;
Level Code Message
Warning 1071 Specified key was too long; max key length is 1536 bytes
-Warning 1071 Specified key was too long; max key length is 1536 bytes
create index idx4 on worklog5743_8(a1, a2(1533));
ERROR 42000: Specified key was too long; max key length is 1536 bytes
show warnings;
@@ -403,11 +386,9 @@ create table worklog5743(a TEXT not null
create index idx1 on worklog5743(a(3073));
Warnings:
Warning 1071 Specified key was too long; max key length is 1536 bytes
-Warning 1071 Specified key was too long; max key length is 1536 bytes
create index idx2 on worklog5743(a(3072));
Warnings:
Warning 1071 Specified key was too long; max key length is 1536 bytes
-Warning 1071 Specified key was too long; max key length is 1536 bytes
show create table worklog5743;
Table Create Table
worklog5743 CREATE TABLE `worklog5743` (
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc 2012-02-01 07:31:47 +0000
+++ b/sql/sql_table.cc 2012-02-01 07:50:40 +0000
@@ -4669,7 +4669,7 @@ make_unique_key_name(const char *field_n
FN_TO_IS_TMP new_name is temporary.
NO_FRM_RENAME Don't rename the FRM file
but only the table in the storage engine.
- NO_HA_TABLE Don't remove table in engine.
+ NO_HA_TABLE Don't rename table in engine.
@return false OK
@return true Error
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-wl5534 branch (jon.hauglid:3476 to 3477) WL#5534 | Jon Olav Hauglid | 1 Feb |
