3703 Alexander Barkov 2009-11-09 [merge]
Merging Bug#26180 from mysql-next-mr-bugfixing
modified:
mysql-test/r/ctype_utf8.result
mysql-test/t/ctype_utf8.test
3702 Alexander Barkov 2009-11-09 [merge]
Null-merging Bug#24690 Bug#17903
=== modified file 'mysql-test/r/ctype_utf8.result'
--- a/mysql-test/r/ctype_utf8.result 2009-10-23 06:24:37 +0000
+++ b/mysql-test/r/ctype_utf8.result 2009-11-09 11:58:51 +0000
@@ -1915,6 +1915,24 @@ CONVERT(a, CHAR) CONVERT(b, CHAR)
70000 1092
DROP TABLE t1;
End of 5.0 tests
+Start of 5.4 tests
+CREATE TABLE t1 (
+clipid INT NOT NULL,
+Tape TINYTEXT,
+PRIMARY KEY (clipid),
+KEY tape(Tape(255))
+) CHARACTER SET=utf8;
+ALTER TABLE t1 ADD mos TINYINT DEFAULT 0 AFTER clipid;
+SHOW CREATE TABLE t1;
+Table Create Table
+t1 CREATE TABLE `t1` (
+ `clipid` int(11) NOT NULL,
+ `mos` tinyint(4) DEFAULT '0',
+ `Tape` tinytext,
+ PRIMARY KEY (`clipid`),
+ KEY `tape` (`Tape`(255))
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+DROP TABLE t1;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (
predicted_order int NOT NULL,
@@ -2025,7 +2043,10 @@ predicted_order hex(utf8_encoding)
100 E0B78AE2808DE0B6BA
101 E0B78AE2808DE0B6BB
DROP TABLE t1;
-End of 5.1 tests
+End of 5.4 tests
+#
+# Start of 6.0 tests
+#
set names utf8;
select @@collation_connection;
@@collation_connection
@@ -2401,131 +2422,6 @@ b
c
drop table t1;
set max_sort_length=default;
-CREATE TABLE t1 (
-clipid INT NOT NULL,
-Tape TINYTEXT,
-PRIMARY KEY (clipid),
-KEY tape(Tape(255))
-) CHARACTER SET=utf8;
-ALTER TABLE t1 ADD mos TINYINT DEFAULT 0 AFTER clipid;
-SHOW CREATE TABLE t1;
-Table Create Table
-t1 CREATE TABLE `t1` (
- `clipid` int(11) NOT NULL,
- `mos` tinyint(4) DEFAULT '0',
- `Tape` tinytext,
- PRIMARY KEY (`clipid`),
- KEY `tape` (`Tape`(255))
-) ENGINE=MyISAM DEFAULT CHARSET=utf8
-DROP TABLE t1;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (
-predicted_order int NOT NULL,
-utf8_encoding VARCHAR(10) NOT NULL
-) CHARACTER SET utf8;
-INSERT INTO t1 VALUES (19, x'E0B696'), (30, x'E0B69AE0B798'), (61, x'E0B6AF'), (93, x'E0B799'), (52, x'E0B6A6'), (73, x'E0B6BBE0B78AE2808D'), (3, x'E0B686'), (56, x'E0B6AA'), (55, x'E0B6A9'), (70, x'E0B6B9'), (94, x'E0B79A'), (80, x'E0B785'), (25, x'E0B69AE0B791'), (48, x'E0B6A2'), (13, x'E0B690'), (86, x'E0B793'), (91, x'E0B79F'), (81, x'E0B786'), (79, x'E0B784'), (14, x'E0B691'), (99, x'E0B78A'), (8, x'E0B68B'), (68, x'E0B6B7'), (22, x'E0B69A'), (16, x'E0B693'), (33, x'E0B69AE0B7B3'), (38, x'E0B69AE0B79D'), (21, x'E0B683'), (11, x'E0B68E'), (77, x'E0B782'), (40, x'E0B69AE0B78A'), (101, x'E0B78AE2808DE0B6BB'), (35, x'E0B69AE0B79A'), (1, x'E0B7B4'), (9, x'E0B68C'), (96, x'E0B79C'), (6, x'E0B689'), (95, x'E0B79B'), (88, x'E0B796'), (64, x'E0B6B3'), (26, x'E0B69AE0B792'), (82, x'E0B78F'), (28, x'E0B69AE0B794'), (39, x'E0B69AE0B79E'), (97, x'E0B79D'), (2, x'E0B685'), (75, x'E0B780'), (34, x'E0B69AE0B799'), (69, x'E0B6B8'), (83, x'E0B790'), (18, x'E0B695'), (90, x'E0B7B2'), (17!
, x'E0B694'), (72, x'E0B6BB'), (66, x'E0B6B5'), (59, x'E0B6AD'), (44, x'E0B69E'), (15, x'E0B692'), (23, x'E0B69AE0B78F'), (65, x'E0B6B4'), (42, x'E0B69C'), (63, x'E0B6B1'), (85, x'E0B792'), (47, x'E0B6A1'), (49, x'E0B6A3'), (92, x'E0B7B3'), (78, x'E0B783'), (36, x'E0B69AE0B79B'), (4, x'E0B687'), (24, x'E0B69AE0B790'), (87, x'E0B794'), (37, x'E0B69AE0B79C'), (32, x'E0B69AE0B79F'), (29, x'E0B69AE0B796'), (43, x'E0B69D'), (62, x'E0B6B0'), (100, x'E0B78AE2808DE0B6BA'), (60, x'E0B6AE'), (45, x'E0B69F'), (12, x'E0B68F'), (46, x'E0B6A0'), (50, x'E0B6A5'), (51, x'E0B6A4'), (5, x'E0B688'), (76, x'E0B781'), (89, x'E0B798'), (74, x'E0B6BD'), (10, x'E0B68D'), (57, x'E0B6AB'), (71, x'E0B6BA'), (58, x'E0B6AC'), (27, x'E0B69AE0B793'), (54, x'E0B6A8'), (84, x'E0B791'), (31, x'E0B69AE0B7B2'), (98, x'E0B79E'), (53, x'E0B6A7'), (41, x'E0B69B'), (67, x'E0B6B6'), (7, x'E0B68A'), (20, x'E0B682');
-SELECT predicted_order, hex(utf8_encoding) FROM t1 ORDER BY utf8_encoding COLLATE utf8_sinhala_ci;
-predicted_order hex(utf8_encoding)
-1 E0B7B4
-2 E0B685
-3 E0B686
-4 E0B687
-5 E0B688
-6 E0B689
-7 E0B68A
-8 E0B68B
-9 E0B68C
-10 E0B68D
-11 E0B68E
-12 E0B68F
-13 E0B690
-14 E0B691
-15 E0B692
-16 E0B693
-17 E0B694
-18 E0B695
-19 E0B696
-20 E0B682
-21 E0B683
-22 E0B69A
-23 E0B69AE0B78F
-24 E0B69AE0B790
-25 E0B69AE0B791
-26 E0B69AE0B792
-27 E0B69AE0B793
-28 E0B69AE0B794
-29 E0B69AE0B796
-30 E0B69AE0B798
-31 E0B69AE0B7B2
-32 E0B69AE0B79F
-33 E0B69AE0B7B3
-34 E0B69AE0B799
-35 E0B69AE0B79A
-36 E0B69AE0B79B
-37 E0B69AE0B79C
-38 E0B69AE0B79D
-39 E0B69AE0B79E
-40 E0B69AE0B78A
-41 E0B69B
-42 E0B69C
-43 E0B69D
-44 E0B69E
-45 E0B69F
-46 E0B6A0
-47 E0B6A1
-48 E0B6A2
-49 E0B6A3
-50 E0B6A5
-51 E0B6A4
-52 E0B6A6
-53 E0B6A7
-54 E0B6A8
-55 E0B6A9
-56 E0B6AA
-57 E0B6AB
-58 E0B6AC
-59 E0B6AD
-60 E0B6AE
-61 E0B6AF
-62 E0B6B0
-63 E0B6B1
-64 E0B6B3
-65 E0B6B4
-66 E0B6B5
-67 E0B6B6
-68 E0B6B7
-69 E0B6B8
-70 E0B6B9
-71 E0B6BA
-72 E0B6BB
-73 E0B6BBE0B78AE2808D
-74 E0B6BD
-75 E0B780
-76 E0B781
-77 E0B782
-78 E0B783
-79 E0B784
-80 E0B785
-81 E0B786
-82 E0B78F
-83 E0B790
-84 E0B791
-85 E0B792
-86 E0B793
-87 E0B794
-88 E0B796
-89 E0B798
-90 E0B7B2
-91 E0B79F
-92 E0B7B3
-93 E0B799
-94 E0B79A
-95 E0B79B
-96 E0B79C
-97 E0B79D
-98 E0B79E
-99 E0B78A
-100 E0B78AE2808DE0B6BA
-101 E0B78AE2808DE0B6BB
-DROP TABLE t1;
-End of tests
+#
+# End of 6.0 tests
+#
=== modified file 'mysql-test/t/ctype_utf8.test'
--- a/mysql-test/t/ctype_utf8.test 2009-10-12 09:08:34 +0000
+++ b/mysql-test/t/ctype_utf8.test 2009-11-09 11:58:51 +0000
@@ -1448,6 +1448,21 @@ DROP TABLE t1;
--echo End of 5.0 tests
+
+--echo Start of 5.4 tests
+#
+# Bug#26180: Can't add columns to tables created with utf8 text indexes
+#
+CREATE TABLE t1 (
+ clipid INT NOT NULL,
+ Tape TINYTEXT,
+ PRIMARY KEY (clipid),
+ KEY tape(Tape(255))
+) CHARACTER SET=utf8;
+ALTER TABLE t1 ADD mos TINYINT DEFAULT 0 AFTER clipid;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
#
# Bug#26474: Add Sinhala script (Sri Lanka) collation to MySQL
#
@@ -1462,8 +1477,12 @@ INSERT INTO t1 VALUES (19, x'E0B696'), (
SELECT predicted_order, hex(utf8_encoding) FROM t1 ORDER BY utf8_encoding COLLATE utf8_sinhala_ci;
DROP TABLE t1;
---echo End of 5.1 tests
+--echo End of 5.4 tests
+--echo #
+--echo # Start of 6.0 tests
+--echo #
+
set names utf8;
--source include/weight_string.inc
--source include/weight_string_euro.inc
@@ -1487,31 +1506,6 @@ select * from t1 order by a;
drop table t1;
set max_sort_length=default;
-#
-# Bug#26180: Can't add columns to tables created with utf8 text indexes
-#
-CREATE TABLE t1 (
- clipid INT NOT NULL,
- Tape TINYTEXT,
- PRIMARY KEY (clipid),
- KEY tape(Tape(255))
-) CHARACTER SET=utf8;
-ALTER TABLE t1 ADD mos TINYINT DEFAULT 0 AFTER clipid;
-SHOW CREATE TABLE t1;
-DROP TABLE t1;
-
-#
-# Bug#26474: Add Sinhala script (Sri Lanka) collation to MySQL
-#
---disable_warnings
-DROP TABLE IF EXISTS t1;
---enable_warnings
-CREATE TABLE t1 (
- predicted_order int NOT NULL,
- utf8_encoding VARCHAR(10) NOT NULL
-) CHARACTER SET utf8;
-INSERT INTO t1 VALUES (19, x'E0B696'), (30, x'E0B69AE0B798'), (61, x'E0B6AF'), (93, x'E0B799'), (52, x'E0B6A6'), (73, x'E0B6BBE0B78AE2808D'), (3, x'E0B686'), (56, x'E0B6AA'), (55, x'E0B6A9'), (70, x'E0B6B9'), (94, x'E0B79A'), (80, x'E0B785'), (25, x'E0B69AE0B791'), (48, x'E0B6A2'), (13, x'E0B690'), (86, x'E0B793'), (91, x'E0B79F'), (81, x'E0B786'), (79, x'E0B784'), (14, x'E0B691'), (99, x'E0B78A'), (8, x'E0B68B'), (68, x'E0B6B7'), (22, x'E0B69A'), (16, x'E0B693'), (33, x'E0B69AE0B7B3'), (38, x'E0B69AE0B79D'), (21, x'E0B683'), (11, x'E0B68E'), (77, x'E0B782'), (40, x'E0B69AE0B78A'), (101, x'E0B78AE2808DE0B6BB'), (35, x'E0B69AE0B79A'), (1, x'E0B7B4'), (9, x'E0B68C'), (96, x'E0B79C'), (6, x'E0B689'), (95, x'E0B79B'), (88, x'E0B796'), (64, x'E0B6B3'), (26, x'E0B69AE0B792'), (82, x'E0B78F'), (28, x'E0B69AE0B794'), (39, x'E0B69AE0B79E'), (97, x'E0B79D'), (2, x'E0B685'), (75, x'E0B780'), (34, x'E0B69AE0B799'), (69, x'E0B6B8'), (83, x'E0B790'), (18, x'E0B695'), (90, x'E0B7B2'), (17!
, x'E0B694'), (72, x'E0B6BB'), (66, x'E0B6B5'), (59, x'E0B6AD'), (44, x'E0B69E'), (15, x'E0B692'), (23, x'E0B69AE0B78F'), (65, x'E0B6B4'), (42, x'E0B69C'), (63, x'E0B6B1'), (85, x'E0B792'), (47, x'E0B6A1'), (49, x'E0B6A3'), (92, x'E0B7B3'), (78, x'E0B783'), (36, x'E0B69AE0B79B'), (4, x'E0B687'), (24, x'E0B69AE0B790'), (87, x'E0B794'), (37, x'E0B69AE0B79C'), (32, x'E0B69AE0B79F'), (29, x'E0B69AE0B796'), (43, x'E0B69D'), (62, x'E0B6B0'), (100, x'E0B78AE2808DE0B6BA'), (60, x'E0B6AE'), (45, x'E0B69F'), (12, x'E0B68F'), (46, x'E0B6A0'), (50, x'E0B6A5'), (51, x'E0B6A4'), (5, x'E0B688'), (76, x'E0B781'), (89, x'E0B798'), (74, x'E0B6BD'), (10, x'E0B68D'), (57, x'E0B6AB'), (71, x'E0B6BA'), (58, x'E0B6AC'), (27, x'E0B69AE0B793'), (54, x'E0B6A8'), (84, x'E0B791'), (31, x'E0B69AE0B7B2'), (98, x'E0B79E'), (53, x'E0B6A7'), (41, x'E0B69B'), (67, x'E0B6B6'), (7, x'E0B68A'), (20, x'E0B682');
-SELECT predicted_order, hex(utf8_encoding) FROM t1 ORDER BY utf8_encoding COLLATE utf8_sinhala_ci;
-DROP TABLE t1;
-
---echo End of tests
+--echo #
+--echo # End of 6.0 tests
+--echo #
Attachment: [text/bzr-bundle] bzr/bar@mysql.com-20091109115851-4z1g7fq2d9mfxpde.bundle
| Thread |
|---|
| • bzr push into mysql-6.0-codebase-bugfixing branch (bar:3702 to 3703)Bug#26180 | Alexander Barkov | 9 Nov |
