diff options
| author | unknown <bar@mysql.com> | 2006-04-04 15:40:42 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-04-04 15:40:42 +0500 |
| commit | ff3495c414db76a34067bf75c64e9e840fb2c8a6 (patch) | |
| tree | a8926b4346753c1fc2c5ed64f4e0685f6c253a7c /mysql-test/r/information_schema.result | |
| parent | d6d7213d68046269e7afdbdef4e38c1c6f0c9838 (diff) | |
| download | mariadb-git-ff3495c414db76a34067bf75c64e9e840fb2c8a6.tar.gz | |
After merge fix for Bug#12076 --with-extra-charsets has no effect
mysql-test/r/information_schema.result:
IS_COMPILED is not determenistic
mysql-test/t/information_schema.test:
IS_COMPILED is not determenistic
strings/conf_to_src.c:
Adding dumping of extra 5.0 fields
strings/ctype-extra.c:
Recreating sources according to 5.0 XML files using conf_to_src.
Diffstat (limited to 'mysql-test/r/information_schema.result')
| -rw-r--r-- | mysql-test/r/information_schema.result | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/mysql-test/r/information_schema.result b/mysql-test/r/information_schema.result index 2324fc7440d..770d9265830 100644 --- a/mysql-test/r/information_schema.result +++ b/mysql-test/r/information_schema.result @@ -201,34 +201,34 @@ latin1 cp1252 West European latin1_swedish_ci 1 select * from information_schema.COLLATIONS where COLLATION_NAME like 'latin1%'; COLLATION_NAME CHARACTER_SET_NAME ID IS_DEFAULT IS_COMPILED SORTLEN -latin1_german1_ci latin1 5 0 -latin1_swedish_ci latin1 8 Yes Yes 1 -latin1_danish_ci latin1 15 0 -latin1_german2_ci latin1 31 Yes 2 -latin1_bin latin1 47 Yes 1 -latin1_general_ci latin1 48 0 -latin1_general_cs latin1 49 0 -latin1_spanish_ci latin1 94 0 +latin1_german1_ci latin1 5 # 1 +latin1_swedish_ci latin1 8 Yes # 1 +latin1_danish_ci latin1 15 # 1 +latin1_german2_ci latin1 31 # 2 +latin1_bin latin1 47 # 1 +latin1_general_ci latin1 48 # 1 +latin1_general_cs latin1 49 # 1 +latin1_spanish_ci latin1 94 # 1 SHOW COLLATION LIKE 'latin1%'; Collation Charset Id Default Compiled Sortlen -latin1_german1_ci latin1 5 0 -latin1_swedish_ci latin1 8 Yes Yes 1 -latin1_danish_ci latin1 15 0 -latin1_german2_ci latin1 31 Yes 2 -latin1_bin latin1 47 Yes 1 -latin1_general_ci latin1 48 0 -latin1_general_cs latin1 49 0 -latin1_spanish_ci latin1 94 0 +latin1_german1_ci latin1 5 # 1 +latin1_swedish_ci latin1 8 Yes # 1 +latin1_danish_ci latin1 15 # 1 +latin1_german2_ci latin1 31 # 2 +latin1_bin latin1 47 # 1 +latin1_general_ci latin1 48 # 1 +latin1_general_cs latin1 49 # 1 +latin1_spanish_ci latin1 94 # 1 SHOW COLLATION WHERE collation like 'latin1%'; Collation Charset Id Default Compiled Sortlen -latin1_german1_ci latin1 5 0 -latin1_swedish_ci latin1 8 Yes Yes 1 -latin1_danish_ci latin1 15 0 -latin1_german2_ci latin1 31 Yes 2 -latin1_bin latin1 47 Yes 1 -latin1_general_ci latin1 48 0 -latin1_general_cs latin1 49 0 -latin1_spanish_ci latin1 94 0 +latin1_german1_ci latin1 5 # 1 +latin1_swedish_ci latin1 8 Yes # 1 +latin1_danish_ci latin1 15 # 1 +latin1_german2_ci latin1 31 # 2 +latin1_bin latin1 47 # 1 +latin1_general_ci latin1 48 # 1 +latin1_general_cs latin1 49 # 1 +latin1_spanish_ci latin1 94 # 1 select * from information_schema.COLLATION_CHARACTER_SET_APPLICABILITY where COLLATION_NAME like 'latin1%'; COLLATION_NAME CHARACTER_SET_NAME |