database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.2' into bb-10.2-jan

Browse Source
This commit is contained in:
Sergei Golubchik
2016-09-19 09:47:08 +02:00
parent f7be8cf285 f566a4f83c
commit f9bdc7c01a
919 changed files with 70106 additions and 18957 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/engines/funcs/r/comment_column2.result
View File

@@ -249,7 +249,7 @@ abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij
SELECT comment,index_comment,char_length(index_comment) FROM information_schema.statistics WHERE table_name='t1';
comment index_comment char_length(index_comment)
ALTER TABLE t1 ADD COLUMN c64 INTEGER COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij';
ERROR HY000: Too many columns
ERROR HY000: Table definition is too large
SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
table_comment char_length(table_comment)
0
@@ -388,7 +388,7 @@ c63 INTEGER COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghi
c64 INTEGER COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij',
c65 INTEGER COMMENT 'abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij')
;
ERROR HY000: Too many columns
ERROR HY000: Table definition is too large
SELECT table_comment,char_length(table_comment) FROM information_schema.tables WHERE table_name='t1';
table_comment char_length(table_comment)
SELECT column_comment,char_length(column_comment) FROM information_schema.columns WHERE table_name='t1';

78
mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result
View File

@@ -3,14 +3,24 @@ SHOW COLLATION;
Collation Charset Id Default Compiled Sortlen
big5_chinese_ci big5 1 Yes # #
big5_bin big5 84 # #
big5_chinese_nopad_ci big5 1025 # #
big5_nopad_bin big5 1108 # #
dec8_swedish_ci dec8 3 Yes # #
dec8_bin dec8 69 # #
dec8_swedish_nopad_ci dec8 1027 # #
dec8_nopad_bin dec8 1093 # #
cp850_general_ci cp850 4 Yes # #
cp850_bin cp850 80 # #
cp850_general_nopad_ci cp850 1028 # #
cp850_nopad_bin cp850 1104 # #
hp8_english_ci hp8 6 Yes # #
hp8_bin hp8 72 # #
hp8_english_nopad_ci hp8 1030 # #
hp8_nopad_bin hp8 1096 # #
koi8r_general_ci koi8r 7 Yes # #
koi8r_bin koi8r 74 # #
koi8r_general_nopad_ci koi8r 1031 # #
koi8r_nopad_bin koi8r 1098 # #
latin1_german1_ci latin1 5 # #
latin1_swedish_ci latin1 8 Yes # #
latin1_danish_ci latin1 15 # #
@@ -19,42 +29,74 @@ latin1_bin latin1 47 # #
latin1_general_ci latin1 48 # #
latin1_general_cs latin1 49 # #
latin1_spanish_ci latin1 94 # #
latin1_swedish_nopad_ci latin1 1032 # #
latin1_nopad_bin latin1 1071 # #
latin2_czech_cs latin2 2 # #
latin2_general_ci latin2 9 Yes # #
latin2_hungarian_ci latin2 21 # #
latin2_croatian_ci latin2 27 # #
latin2_bin latin2 77 # #
latin2_general_nopad_ci latin2 1033 # #
latin2_nopad_bin latin2 1101 # #
swe7_swedish_ci swe7 10 Yes # #
swe7_bin swe7 82 # #
swe7_swedish_nopad_ci swe7 1034 # #
swe7_nopad_bin swe7 1106 # #
ascii_general_ci ascii 11 Yes # #
ascii_bin ascii 65 # #
ascii_general_nopad_ci ascii 1035 # #
ascii_nopad_bin ascii 1089 # #
ujis_japanese_ci ujis 12 Yes # #
ujis_bin ujis 91 # #
ujis_japanese_nopad_ci ujis 1036 # #
ujis_nopad_bin ujis 1115 # #
sjis_japanese_ci sjis 13 Yes # #
sjis_bin sjis 88 # #
sjis_japanese_nopad_ci sjis 1037 # #
sjis_nopad_bin sjis 1112 # #
hebrew_general_ci hebrew 16 Yes # #
hebrew_bin hebrew 71 # #
hebrew_general_nopad_ci hebrew 1040 # #
hebrew_nopad_bin hebrew 1095 # #
tis620_thai_ci tis620 18 Yes # #
tis620_bin tis620 89 # #
tis620_thai_nopad_ci tis620 1042 # #
tis620_nopad_bin tis620 1113 # #
euckr_korean_ci euckr 19 Yes # #
euckr_bin euckr 85 # #
euckr_korean_nopad_ci euckr 1043 # #
euckr_nopad_bin euckr 1109 # #
koi8u_general_ci koi8u 22 Yes # #
koi8u_bin koi8u 75 # #
koi8u_general_nopad_ci koi8u 1046 # #
koi8u_nopad_bin koi8u 1099 # #
gb2312_chinese_ci gb2312 24 Yes # #
gb2312_bin gb2312 86 # #
gb2312_chinese_nopad_ci gb2312 1048 # #
gb2312_nopad_bin gb2312 1110 # #
greek_general_ci greek 25 Yes # #
greek_bin greek 70 # #
greek_general_nopad_ci greek 1049 # #
greek_nopad_bin greek 1094 # #
cp1250_general_ci cp1250 26 Yes # #
cp1250_czech_cs cp1250 34 # #
cp1250_croatian_ci cp1250 44 # #
cp1250_bin cp1250 66 # #
cp1250_polish_ci cp1250 99 # #
cp1250_general_nopad_ci cp1250 1050 # #
cp1250_nopad_bin cp1250 1090 # #
gbk_chinese_ci gbk 28 Yes # #
gbk_bin gbk 87 # #
gbk_chinese_nopad_ci gbk 1052 # #
gbk_nopad_bin gbk 1111 # #
latin5_turkish_ci latin5 30 Yes # #
latin5_bin latin5 78 # #
latin5_turkish_nopad_ci latin5 1054 # #
latin5_nopad_bin latin5 1102 # #
armscii8_general_ci armscii8 32 Yes # #
armscii8_bin armscii8 64 # #
armscii8_general_nopad_ci armscii8 1056 # #
armscii8_nopad_bin armscii8 1088 # #
utf8_general_ci utf8 33 Yes # #
utf8_bin utf8 83 # #
utf8_unicode_ci utf8 192 # #
@@ -85,6 +127,8 @@ utf8_general_mysql500_ci utf8 223 # #
utf8_croatian_ci utf8 576 # #
utf8_myanmar_ci utf8 577 # #
utf8_thai_520_w2 utf8 578 # #
utf8_general_nopad_ci utf8 1057 # #
utf8_nopad_bin utf8 1107 # #
ucs2_general_ci ucs2 35 Yes # #
ucs2_bin ucs2 90 # #
ucs2_unicode_ci ucs2 128 # #
@@ -115,20 +159,34 @@ ucs2_general_mysql500_ci ucs2 159 # #
ucs2_croatian_ci ucs2 640 # #
ucs2_myanmar_ci ucs2 641 # #
ucs2_thai_520_w2 ucs2 642 # #
ucs2_general_nopad_ci ucs2 1059 # #
ucs2_nopad_bin ucs2 1114 # #
cp866_general_ci cp866 36 Yes # #
cp866_bin cp866 68 # #
cp866_general_nopad_ci cp866 1060 # #
cp866_nopad_bin cp866 1092 # #
keybcs2_general_ci keybcs2 37 Yes # #
keybcs2_bin keybcs2 73 # #
keybcs2_general_nopad_ci keybcs2 1061 # #
keybcs2_nopad_bin keybcs2 1097 # #
macce_general_ci macce 38 Yes # #
macce_bin macce 43 # #
macce_general_nopad_ci macce 1062 # #
macce_nopad_bin macce 1067 # #
macroman_general_ci macroman 39 Yes # #
macroman_bin macroman 53 # #
macroman_general_nopad_ci macroman 1063 # #
macroman_nopad_bin macroman 1077 # #
cp852_general_ci cp852 40 Yes # #
cp852_bin cp852 81 # #
cp852_general_nopad_ci cp852 1064 # #
cp852_nopad_bin cp852 1105 # #
latin7_estonian_cs latin7 20 # #
latin7_general_ci latin7 41 Yes # #
latin7_general_cs latin7 42 # #
latin7_bin latin7 79 # #
latin7_general_nopad_ci latin7 1065 # #
latin7_nopad_bin latin7 1103 # #
utf8mb4_general_ci utf8mb4 45 Yes # #
utf8mb4_bin utf8mb4 46 # #
utf8mb4_unicode_ci utf8mb4 224 # #
@@ -158,11 +216,15 @@ utf8mb4_vietnamese_ci utf8mb4 247 # #
utf8mb4_croatian_ci utf8mb4 608 # #
utf8mb4_myanmar_ci utf8mb4 609 # #
utf8mb4_thai_520_w2 utf8mb4 610 # #
utf8mb4_general_nopad_ci utf8mb4 1069 # #
utf8mb4_nopad_bin utf8mb4 1070 # #
cp1251_bulgarian_ci cp1251 14 # #
cp1251_ukrainian_ci cp1251 23 # #
cp1251_bin cp1251 50 # #
cp1251_general_ci cp1251 51 Yes # #
cp1251_general_cs cp1251 52 # #
cp1251_nopad_bin cp1251 1074 # #
cp1251_general_nopad_ci cp1251 1075 # #
utf16_general_ci utf16 54 Yes # #
utf16_bin utf16 55 # #
utf16_unicode_ci utf16 101 # #
@@ -192,13 +254,21 @@ utf16_vietnamese_ci utf16 124 # #
utf16_croatian_ci utf16 672 # #
utf16_myanmar_ci utf16 673 # #
utf16_thai_520_w2 utf16 674 # #
utf16_general_nopad_ci utf16 1078 # #
utf16_nopad_bin utf16 1079 # #
utf16le_general_ci utf16le 56 Yes # #
utf16le_bin utf16le 62 # #
utf16le_general_nopad_ci utf16le 1080 # #
utf16le_nopad_bin utf16le 1086 # #
cp1256_general_ci cp1256 57 Yes # #
cp1256_bin cp1256 67 # #
cp1256_general_nopad_ci cp1256 1081 # #
cp1256_nopad_bin cp1256 1091 # #
cp1257_lithuanian_ci cp1257 29 # #
cp1257_bin cp1257 58 # #
cp1257_general_ci cp1257 59 Yes # #
cp1257_nopad_bin cp1257 1082 # #
cp1257_general_nopad_ci cp1257 1083 # #
utf32_general_ci utf32 60 Yes # #
utf32_bin utf32 61 # #
utf32_unicode_ci utf32 160 # #
@@ -228,13 +298,21 @@ utf32_vietnamese_ci utf32 183 # #
utf32_croatian_ci utf32 736 # #
utf32_myanmar_ci utf32 737 # #
utf32_thai_520_w2 utf32 738 # #
utf32_general_nopad_ci utf32 1084 # #
utf32_nopad_bin utf32 1085 # #
binary binary 63 Yes # #
geostd8_general_ci geostd8 92 Yes # #
geostd8_bin geostd8 93 # #
geostd8_general_nopad_ci geostd8 1116 # #
geostd8_nopad_bin geostd8 1117 # #
cp932_japanese_ci cp932 95 Yes # #
cp932_bin cp932 96 # #
cp932_japanese_nopad_ci cp932 1119 # #
cp932_nopad_bin cp932 1120 # #
eucjpms_japanese_ci eucjpms 97 Yes # #
eucjpms_bin eucjpms 98 # #
eucjpms_japanese_nopad_ci eucjpms 1121 # #
eucjpms_nopad_bin eucjpms 1122 # #
CREATE DATABASE d9 DEFAULT CHARACTER SET ascii;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH

78
mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result
View File

@@ -3,14 +3,24 @@ SHOW COLLATION;
Collation Charset Id Default Compiled Sortlen
big5_chinese_ci big5 1 Yes # #
big5_bin big5 84 # #
big5_chinese_nopad_ci big5 1025 # #
big5_nopad_bin big5 1108 # #
dec8_swedish_ci dec8 3 Yes # #
dec8_bin dec8 69 # #
dec8_swedish_nopad_ci dec8 1027 # #
dec8_nopad_bin dec8 1093 # #
cp850_general_ci cp850 4 Yes # #
cp850_bin cp850 80 # #
cp850_general_nopad_ci cp850 1028 # #
cp850_nopad_bin cp850 1104 # #
hp8_english_ci hp8 6 Yes # #
hp8_bin hp8 72 # #
hp8_english_nopad_ci hp8 1030 # #
hp8_nopad_bin hp8 1096 # #
koi8r_general_ci koi8r 7 Yes # #
koi8r_bin koi8r 74 # #
koi8r_general_nopad_ci koi8r 1031 # #
koi8r_nopad_bin koi8r 1098 # #
latin1_german1_ci latin1 5 # #
latin1_swedish_ci latin1 8 Yes # #
latin1_danish_ci latin1 15 # #
@@ -19,42 +29,74 @@ latin1_bin latin1 47 # #
latin1_general_ci latin1 48 # #
latin1_general_cs latin1 49 # #
latin1_spanish_ci latin1 94 # #
latin1_swedish_nopad_ci latin1 1032 # #
latin1_nopad_bin latin1 1071 # #
latin2_czech_cs latin2 2 # #
latin2_general_ci latin2 9 Yes # #
latin2_hungarian_ci latin2 21 # #
latin2_croatian_ci latin2 27 # #
latin2_bin latin2 77 # #
latin2_general_nopad_ci latin2 1033 # #
latin2_nopad_bin latin2 1101 # #
swe7_swedish_ci swe7 10 Yes # #
swe7_bin swe7 82 # #
swe7_swedish_nopad_ci swe7 1034 # #
swe7_nopad_bin swe7 1106 # #
ascii_general_ci ascii 11 Yes # #
ascii_bin ascii 65 # #
ascii_general_nopad_ci ascii 1035 # #
ascii_nopad_bin ascii 1089 # #
ujis_japanese_ci ujis 12 Yes # #
ujis_bin ujis 91 # #
ujis_japanese_nopad_ci ujis 1036 # #
ujis_nopad_bin ujis 1115 # #
sjis_japanese_ci sjis 13 Yes # #
sjis_bin sjis 88 # #
sjis_japanese_nopad_ci sjis 1037 # #
sjis_nopad_bin sjis 1112 # #
hebrew_general_ci hebrew 16 Yes # #
hebrew_bin hebrew 71 # #
hebrew_general_nopad_ci hebrew 1040 # #
hebrew_nopad_bin hebrew 1095 # #
tis620_thai_ci tis620 18 Yes # #
tis620_bin tis620 89 # #
tis620_thai_nopad_ci tis620 1042 # #
tis620_nopad_bin tis620 1113 # #
euckr_korean_ci euckr 19 Yes # #
euckr_bin euckr 85 # #
euckr_korean_nopad_ci euckr 1043 # #
euckr_nopad_bin euckr 1109 # #
koi8u_general_ci koi8u 22 Yes # #
koi8u_bin koi8u 75 # #
koi8u_general_nopad_ci koi8u 1046 # #
koi8u_nopad_bin koi8u 1099 # #
gb2312_chinese_ci gb2312 24 Yes # #
gb2312_bin gb2312 86 # #
gb2312_chinese_nopad_ci gb2312 1048 # #
gb2312_nopad_bin gb2312 1110 # #
greek_general_ci greek 25 Yes # #
greek_bin greek 70 # #
greek_general_nopad_ci greek 1049 # #
greek_nopad_bin greek 1094 # #
cp1250_general_ci cp1250 26 Yes # #
cp1250_czech_cs cp1250 34 # #
cp1250_croatian_ci cp1250 44 # #
cp1250_bin cp1250 66 # #
cp1250_polish_ci cp1250 99 # #
cp1250_general_nopad_ci cp1250 1050 # #
cp1250_nopad_bin cp1250 1090 # #
gbk_chinese_ci gbk 28 Yes # #
gbk_bin gbk 87 # #
gbk_chinese_nopad_ci gbk 1052 # #
gbk_nopad_bin gbk 1111 # #
latin5_turkish_ci latin5 30 Yes # #
latin5_bin latin5 78 # #
latin5_turkish_nopad_ci latin5 1054 # #
latin5_nopad_bin latin5 1102 # #
armscii8_general_ci armscii8 32 Yes # #
armscii8_bin armscii8 64 # #
armscii8_general_nopad_ci armscii8 1056 # #
armscii8_nopad_bin armscii8 1088 # #
utf8_general_ci utf8 33 Yes # #
utf8_bin utf8 83 # #
utf8_unicode_ci utf8 192 # #
@@ -85,6 +127,8 @@ utf8_general_mysql500_ci utf8 223 # #
utf8_croatian_ci utf8 576 # #
utf8_myanmar_ci utf8 577 # #
utf8_thai_520_w2 utf8 578 # #
utf8_general_nopad_ci utf8 1057 # #
utf8_nopad_bin utf8 1107 # #
ucs2_general_ci ucs2 35 Yes # #
ucs2_bin ucs2 90 # #
ucs2_unicode_ci ucs2 128 # #
@@ -115,20 +159,34 @@ ucs2_general_mysql500_ci ucs2 159 # #
ucs2_croatian_ci ucs2 640 # #
ucs2_myanmar_ci ucs2 641 # #
ucs2_thai_520_w2 ucs2 642 # #
ucs2_general_nopad_ci ucs2 1059 # #
ucs2_nopad_bin ucs2 1114 # #
cp866_general_ci cp866 36 Yes # #
cp866_bin cp866 68 # #
cp866_general_nopad_ci cp866 1060 # #
cp866_nopad_bin cp866 1092 # #
keybcs2_general_ci keybcs2 37 Yes # #
keybcs2_bin keybcs2 73 # #
keybcs2_general_nopad_ci keybcs2 1061 # #
keybcs2_nopad_bin keybcs2 1097 # #
macce_general_ci macce 38 Yes # #
macce_bin macce 43 # #
macce_general_nopad_ci macce 1062 # #
macce_nopad_bin macce 1067 # #
macroman_general_ci macroman 39 Yes # #
macroman_bin macroman 53 # #
macroman_general_nopad_ci macroman 1063 # #
macroman_nopad_bin macroman 1077 # #
cp852_general_ci cp852 40 Yes # #
cp852_bin cp852 81 # #
cp852_general_nopad_ci cp852 1064 # #
cp852_nopad_bin cp852 1105 # #
latin7_estonian_cs latin7 20 # #
latin7_general_ci latin7 41 Yes # #
latin7_general_cs latin7 42 # #
latin7_bin latin7 79 # #
latin7_general_nopad_ci latin7 1065 # #
latin7_nopad_bin latin7 1103 # #
utf8mb4_general_ci utf8mb4 45 Yes # #
utf8mb4_bin utf8mb4 46 # #
utf8mb4_unicode_ci utf8mb4 224 # #
@@ -158,11 +216,15 @@ utf8mb4_vietnamese_ci utf8mb4 247 # #
utf8mb4_croatian_ci utf8mb4 608 # #
utf8mb4_myanmar_ci utf8mb4 609 # #
utf8mb4_thai_520_w2 utf8mb4 610 # #
utf8mb4_general_nopad_ci utf8mb4 1069 # #
utf8mb4_nopad_bin utf8mb4 1070 # #
cp1251_bulgarian_ci cp1251 14 # #
cp1251_ukrainian_ci cp1251 23 # #
cp1251_bin cp1251 50 # #
cp1251_general_ci cp1251 51 Yes # #
cp1251_general_cs cp1251 52 # #
cp1251_nopad_bin cp1251 1074 # #
cp1251_general_nopad_ci cp1251 1075 # #
utf16_general_ci utf16 54 Yes # #
utf16_bin utf16 55 # #
utf16_unicode_ci utf16 101 # #
@@ -192,13 +254,21 @@ utf16_vietnamese_ci utf16 124 # #
utf16_croatian_ci utf16 672 # #
utf16_myanmar_ci utf16 673 # #
utf16_thai_520_w2 utf16 674 # #
utf16_general_nopad_ci utf16 1078 # #
utf16_nopad_bin utf16 1079 # #
utf16le_general_ci utf16le 56 Yes # #
utf16le_bin utf16le 62 # #
utf16le_general_nopad_ci utf16le 1080 # #
utf16le_nopad_bin utf16le 1086 # #
cp1256_general_ci cp1256 57 Yes # #
cp1256_bin cp1256 67 # #
cp1256_general_nopad_ci cp1256 1081 # #
cp1256_nopad_bin cp1256 1091 # #
cp1257_lithuanian_ci cp1257 29 # #
cp1257_bin cp1257 58 # #
cp1257_general_ci cp1257 59 Yes # #
cp1257_nopad_bin cp1257 1082 # #
cp1257_general_nopad_ci cp1257 1083 # #
utf32_general_ci utf32 60 Yes # #
utf32_bin utf32 61 # #
utf32_unicode_ci utf32 160 # #
@@ -228,13 +298,21 @@ utf32_vietnamese_ci utf32 183 # #
utf32_croatian_ci utf32 736 # #
utf32_myanmar_ci utf32 737 # #
utf32_thai_520_w2 utf32 738 # #
utf32_general_nopad_ci utf32 1084 # #
utf32_nopad_bin utf32 1085 # #
binary binary 63 Yes # #
geostd8_general_ci geostd8 92 Yes # #
geostd8_bin geostd8 93 # #
geostd8_general_nopad_ci geostd8 1116 # #
geostd8_nopad_bin geostd8 1117 # #
cp932_japanese_ci cp932 95 Yes # #
cp932_bin cp932 96 # #
cp932_japanese_nopad_ci cp932 1119 # #
cp932_nopad_bin cp932 1120 # #
eucjpms_japanese_ci eucjpms 97 Yes # #
eucjpms_bin eucjpms 98 # #
eucjpms_japanese_nopad_ci eucjpms 1121 # #
eucjpms_nopad_bin eucjpms 1122 # #
CREATE DATABASE d10 DEFAULT CHARACTER SET utf8;
SELECT * FROM INFORMATION_SCHEMA.SCHEMATA ORDER BY SCHEMA_NAME;
CATALOG_NAME SCHEMA_NAME DEFAULT_CHARACTER_SET_NAME DEFAULT_COLLATION_NAME SQL_PATH

44
mysql-test/suite/engines/funcs/r/ta_set_drop_default.result
View File

@@ -19,7 +19,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` tinyint(4) NOT NULL,
`c2` tinyint(4) DEFAULT '10',
`c2` tinyint(4) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER c2 DROP DEFAULT;
@@ -60,7 +60,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` smallint(6) NOT NULL,
`c2` smallint(6) DEFAULT '10',
`c2` smallint(6) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER c2 DROP DEFAULT;
@@ -101,7 +101,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` mediumint(9) NOT NULL,
`c2` mediumint(9) DEFAULT '10',
`c2` mediumint(9) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER c2 DROP DEFAULT;
@@ -142,7 +142,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` int(11) DEFAULT '10',
`c2` int(11) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER c2 DROP DEFAULT;
@@ -183,7 +183,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` int(11) DEFAULT '10',
`c2` int(11) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER c2 DROP DEFAULT;
@@ -224,7 +224,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`c2` bigint(20) DEFAULT '10',
`c2` bigint(20) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER c2 DROP DEFAULT;
@@ -265,7 +265,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` double NOT NULL,
`c2` double DEFAULT '10',
`c2` double DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER c2 DROP DEFAULT;
@@ -306,7 +306,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` double NOT NULL,
`c2` double DEFAULT '10',
`c2` double DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER c2 DROP DEFAULT;
@@ -347,7 +347,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` float NOT NULL,
`c2` float DEFAULT '10',
`c2` float DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER c2 DROP DEFAULT;
@@ -388,7 +388,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` decimal(10,0) NOT NULL,
`c2` decimal(10,0) DEFAULT '10',
`c2` decimal(10,0) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER c2 DROP DEFAULT;
@@ -429,7 +429,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` decimal(10,0) NOT NULL,
`c2` decimal(10,0) DEFAULT '10',
`c2` decimal(10,0) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER c2 DROP DEFAULT;
@@ -470,7 +470,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` tinyint(4) NOT NULL,
`c2` tinyint(4) DEFAULT '10',
`c2` tinyint(4) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -511,7 +511,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` smallint(6) NOT NULL,
`c2` smallint(6) DEFAULT '10',
`c2` smallint(6) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -552,7 +552,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` mediumint(9) NOT NULL,
`c2` mediumint(9) DEFAULT '10',
`c2` mediumint(9) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -593,7 +593,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` int(11) DEFAULT '10',
`c2` int(11) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -634,7 +634,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` int(11) NOT NULL,
`c2` int(11) DEFAULT '10',
`c2` int(11) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -675,7 +675,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` bigint(20) NOT NULL,
`c2` bigint(20) DEFAULT '10',
`c2` bigint(20) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -716,7 +716,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` double NOT NULL,
`c2` double DEFAULT '10',
`c2` double DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -757,7 +757,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` double NOT NULL,
`c2` double DEFAULT '10',
`c2` double DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -798,7 +798,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` float NOT NULL,
`c2` float DEFAULT '10',
`c2` float DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -839,7 +839,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` decimal(10,0) NOT NULL,
`c2` decimal(10,0) DEFAULT '10',
`c2` decimal(10,0) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;
@@ -880,7 +880,7 @@ SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c1` decimal(10,0) NOT NULL,
`c2` decimal(10,0) DEFAULT '10',
`c2` decimal(10,0) DEFAULT 10,
PRIMARY KEY (`c1`)
) ENGINE=ENGINE DEFAULT CHARSET=latin1
ALTER TABLE t1 ALTER COLUMN c2 DROP DEFAULT;

32
mysql-test/suite/engines/funcs/r/tc_column_default_decimal.result
View File

@@ -7,7 +7,7 @@ t12
SHOW CREATE TABLE t12;
Table Create Table
t12 CREATE TABLE `t12` (
`c1` decimal(5,0) DEFAULT '2'
`c1` decimal(5,0) DEFAULT 2
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t12;
SHOW TABLES;
@@ -19,7 +19,7 @@ t13
SHOW CREATE TABLE t13;
Table Create Table
t13 CREATE TABLE `t13` (
`c1` decimal(5,4) DEFAULT '3.1234'
`c1` decimal(5,4) DEFAULT 3.1234
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t13;
SHOW TABLES;
@@ -31,7 +31,7 @@ t12
SHOW CREATE TABLE t12;
Table Create Table
t12 CREATE TABLE `t12` (
`c1` decimal(5,0) DEFAULT '2'
`c1` decimal(5,0) DEFAULT 2
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t12;
SHOW TABLES;
@@ -43,7 +43,7 @@ t13
SHOW CREATE TABLE t13;
Table Create Table
t13 CREATE TABLE `t13` (
`c1` decimal(5,4) DEFAULT '3.1234'
`c1` decimal(5,4) DEFAULT 3.1234
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t13;
SHOW TABLES;
@@ -55,7 +55,7 @@ t12
SHOW CREATE TABLE t12;
Table Create Table
t12 CREATE TABLE `t12` (
`c1` decimal(5,0) DEFAULT '2'
`c1` decimal(5,0) DEFAULT 2
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t12;
SHOW TABLES;
@@ -67,7 +67,7 @@ t13
SHOW CREATE TABLE t13;
Table Create Table
t13 CREATE TABLE `t13` (
`c1` decimal(5,4) DEFAULT '3.1234'
`c1` decimal(5,4) DEFAULT 3.1234
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t13;
SHOW TABLES;
@@ -79,7 +79,7 @@ t12
SHOW CREATE TABLE t12;
Table Create Table
t12 CREATE TABLE `t12` (
`c1` decimal(5,0) DEFAULT '2'
`c1` decimal(5,0) DEFAULT 2
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t12;
SHOW TABLES;
@@ -91,7 +91,7 @@ t13
SHOW CREATE TABLE t13;
Table Create Table
t13 CREATE TABLE `t13` (
`c1` decimal(5,4) DEFAULT '3.1234'
`c1` decimal(5,4) DEFAULT 3.1234
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t13;
SHOW TABLES;
@@ -103,7 +103,7 @@ t12
SHOW CREATE TABLE t12;
Table Create Table
t12 CREATE TABLE `t12` (
`c1` decimal(5,0) NOT NULL DEFAULT '2'
`c1` decimal(5,0) NOT NULL DEFAULT 2
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t12;
SHOW TABLES;
@@ -115,7 +115,7 @@ t13
SHOW CREATE TABLE t13;
Table Create Table
t13 CREATE TABLE `t13` (
`c1` decimal(5,4) NOT NULL DEFAULT '3.1234'
`c1` decimal(5,4) NOT NULL DEFAULT 3.1234
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t13;
SHOW TABLES;
@@ -127,7 +127,7 @@ t12
SHOW CREATE TABLE t12;
Table Create Table
t12 CREATE TABLE `t12` (
`c1` decimal(5,0) NOT NULL DEFAULT '2'
`c1` decimal(5,0) NOT NULL DEFAULT 2
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t12;
SHOW TABLES;
@@ -139,7 +139,7 @@ t13
SHOW CREATE TABLE t13;
Table Create Table
t13 CREATE TABLE `t13` (
`c1` decimal(5,4) NOT NULL DEFAULT '3.1234'
`c1` decimal(5,4) NOT NULL DEFAULT 3.1234
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t13;
SHOW TABLES;
@@ -151,7 +151,7 @@ t12
SHOW CREATE TABLE t12;
Table Create Table
t12 CREATE TABLE `t12` (
`c1` decimal(5,0) NOT NULL DEFAULT '2'
`c1` decimal(5,0) NOT NULL DEFAULT 2
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t12;
SHOW TABLES;
@@ -163,7 +163,7 @@ t13
SHOW CREATE TABLE t13;
Table Create Table
t13 CREATE TABLE `t13` (
`c1` decimal(5,4) NOT NULL DEFAULT '3.1234'
`c1` decimal(5,4) NOT NULL DEFAULT 3.1234
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t13;
SHOW TABLES;
@@ -175,7 +175,7 @@ t12
SHOW CREATE TABLE t12;
Table Create Table
t12 CREATE TABLE `t12` (
`c1` decimal(5,0) NOT NULL DEFAULT '2'
`c1` decimal(5,0) NOT NULL DEFAULT 2
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t12;
SHOW TABLES;
@@ -187,7 +187,7 @@ t13
SHOW CREATE TABLE t13;
Table Create Table
t13 CREATE TABLE `t13` (
`c1` decimal(5,4) NOT NULL DEFAULT '3.1234'
`c1` decimal(5,4) NOT NULL DEFAULT 3.1234
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t13;
SHOW TABLES;

24
mysql-test/suite/engines/funcs/r/tc_column_default_number.result
View File

@@ -6,7 +6,7 @@ t11
SHOW CREATE TABLE t11;
Table Create Table
t11 CREATE TABLE `t11` (
`c1` tinyint(5) DEFAULT '1'
`c1` tinyint(5) DEFAULT 1
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t11;
SHOW TABLES;
@@ -18,7 +18,7 @@ t11
SHOW CREATE TABLE t11;
Table Create Table
t11 CREATE TABLE `t11` (
`c1` smallint(5) DEFAULT '1'
`c1` smallint(5) DEFAULT 1
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t11;
SHOW TABLES;
@@ -30,7 +30,7 @@ t11
SHOW CREATE TABLE t11;
Table Create Table
t11 CREATE TABLE `t11` (
`c1` mediumint(5) DEFAULT '1'
`c1` mediumint(5) DEFAULT 1
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t11;
SHOW TABLES;
@@ -42,7 +42,7 @@ t11
SHOW CREATE TABLE t11;
Table Create Table
t11 CREATE TABLE `t11` (
`c1` int(5) DEFAULT '1'
`c1` int(5) DEFAULT 1
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t11;
SHOW TABLES;
@@ -54,7 +54,7 @@ t11
SHOW CREATE TABLE t11;
Table Create Table
t11 CREATE TABLE `t11` (
`c1` int(5) DEFAULT '1'
`c1` int(5) DEFAULT 1
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t11;
SHOW TABLES;
@@ -66,7 +66,7 @@ t11
SHOW CREATE TABLE t11;
Table Create Table
t11 CREATE TABLE `t11` (
`c1` bigint(5) DEFAULT '1'
`c1` bigint(5) DEFAULT 1
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t11;
SHOW TABLES;
@@ -78,7 +78,7 @@ t11
SHOW CREATE TABLE t11;
Table Create Table
t11 CREATE TABLE `t11` (
`c1` tinyint(5) NOT NULL DEFAULT '1'
`c1` tinyint(5) NOT NULL DEFAULT 1
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t11;
SHOW TABLES;
@@ -90,7 +90,7 @@ t11
SHOW CREATE TABLE t11;
Table Create Table
t11 CREATE TABLE `t11` (
`c1` smallint(5) NOT NULL DEFAULT '1'
`c1` smallint(5) NOT NULL DEFAULT 1
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t11;
SHOW TABLES;
@@ -102,7 +102,7 @@ t11
SHOW CREATE TABLE t11;
Table Create Table
t11 CREATE TABLE `t11` (
`c1` mediumint(5) NOT NULL DEFAULT '1'
`c1` mediumint(5) NOT NULL DEFAULT 1
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t11;
SHOW TABLES;
@@ -114,7 +114,7 @@ t11
SHOW CREATE TABLE t11;
Table Create Table
t11 CREATE TABLE `t11` (
`c1` int(5) NOT NULL DEFAULT '1'
`c1` int(5) NOT NULL DEFAULT 1
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t11;
SHOW TABLES;
@@ -126,7 +126,7 @@ t11
SHOW CREATE TABLE t11;
Table Create Table
t11 CREATE TABLE `t11` (
`c1` int(5) NOT NULL DEFAULT '1'
`c1` int(5) NOT NULL DEFAULT 1
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t11;
SHOW TABLES;
@@ -138,7 +138,7 @@ t11
SHOW CREATE TABLE t11;
Table Create Table
t11 CREATE TABLE `t11` (
`c1` bigint(5) NOT NULL DEFAULT '1'
`c1` bigint(5) NOT NULL DEFAULT 1
) ENGINE=ENGINE DEFAULT CHARSET=latin1
DROP TABLE t11;
SHOW TABLES;

3840
mysql-test/suite/engines/funcs/r/tc_multicolumn_different.result
View File

File diff suppressed because it is too large Load Diff