mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse source 
into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1


configure.in:
  Auto merged
This commit is contained in:
unknown 2004-07-02 17:32:47 -05:00
commit d760bfd6b0
6 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.in
View file

@ -2525,7 +2525,7 @@ done
case $default_charset in
armscii8)
default_charset_default_collation="armscii8_general_ci"
default_charset_collations="armscii8_general_ci armscii_bin"
default_charset_collations="armscii8_general_ci armscii8_bin"
;;
ascii)
default_charset_default_collation="ascii_general_ci"

7
mysql-test/r/show_check.result
View file

@ -400,3 +400,10 @@ where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
delete from mysql.db
where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
flush privileges;
set names latin1;
create database `ä`;
create table `ä`.`ä` (a int) engine=heap;
show table status from `ä` LIKE 'ä';
Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
ä HEAP 9 Fixed 0 5 # # # 0 NULL NULL NULL NULL latin1_swedish_ci NULL
drop database `ä`;

8
mysql-test/t/show_check.test
View file

@ -304,3 +304,11 @@ where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
delete from mysql.db
where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
flush privileges;
#Bug #4374 SHOW TABLE STATUS FROM ignores collation_connection
set names latin1;
create database `ä`;
create table `ä`.`ä` (a int) engine=heap;
--replace_column 7 # 8 # 9 #
show table status from `ä` LIKE 'ä';
drop database `ä`;

2
sql/share/charsets/Index.xml
View file

@ -402,7 +402,7 @@ To make maintaining easier please:
<description>ARMSCII-8 Armenian</description>
<alias>armscii-8</alias>
<collation name="armscii8_general_ci" id="32" order="Armenian" flag="primary"/>
<collation name="armscii_bin" id="64" order="Binary" flag="binary"/>
<collation name="armscii8_bin" id="64" order="Binary" flag="binary"/>
</charset>
<charset name="utf8">

2
sql/share/charsets/armscii8.xml
View file

@ -114,7 +114,7 @@
</map>
</collation>
<collation name="armscii_bin" flag="binary"/>
<collation name="armscii8_bin" flag="binary"/>
</charset>

4
sql/sql_yacc.yy
View file

@ -4422,7 +4422,9 @@ opt_db:
wild:
/* empty */
| LIKE text_string { Lex->wild= $2; };
| LIKE TEXT_STRING_sys
{ Lex->wild= new (&YYTHD->mem_root) String($2.str, $2.length,
system_charset_info); };
opt_full:
/* empty */ { Lex->verbose=0; }