database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix merges.

Browse Source
This commit is contained in:
cmiller@zippy.cornsilk.net
2006-11-29 12:49:21 -05:00
parent 80f695e3e6
commit d577e3d4a8
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/func_misc.result
View File

@ -138,7 +138,7 @@ create table t1 select INET_ATON('255.255.0.1') as `a`;
show create table t1; show create table t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`a` bigint(21) unsigned default NULL `a` bigint(21) unsigned DEFAULT NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; drop table t1;
End of 5.0 tests End of 5.0 tests

14
mysql-test/r/mysql.result
View File

@ -61,16 +61,16 @@ database()
test test
unlock tables; unlock tables;
drop table t1; drop table t1;
ƒ\ <EFBFBD>\
ƒ\ <EFBFBD>\
c_cp932 c_cp932
ƒ\ <EFBFBD>\
ƒ\ <EFBFBD>\
ƒ\ <EFBFBD>\
ソ ソ
ソ ソ
ƒ\ <EFBFBD>\
ƒ\ <EFBFBD>\
+----------------------+------------+--------+ +----------------------+------------+--------+
| concat('>',col1,'<') | col2 | col3 | | concat('>',col1,'<') | col2 | col3 |
+----------------------+------------+--------+ +----------------------+------------+--------+

8
mysql-test/t/mysql.test
View File

@ -52,10 +52,10 @@ drop table t1;
--exec $MYSQL --default-character-set=cp932 test -e "charset utf8;" --exec $MYSQL --default-character-set=cp932 test -e "charset utf8;"
# its usage to switch internally in mysql to requested charset # its usage to switch internally in mysql to requested charset
--exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ƒ\'; create table t1 (c_cp932 TEXT CHARACTER SET cp932); insert into t1 values('ƒ\'); select * from t1; drop table t1;" --exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select '<EFBFBD>\'; create table t1 (c_cp932 TEXT CHARACTER SET cp932); insert into t1 values('<EFBFBD>\'); select * from t1; drop table t1;"
--exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select 'ƒ\'" --exec $MYSQL --default-character-set=utf8 test -e "charset cp932; select '<EFBFBD>\'"
--exec $MYSQL --default-character-set=utf8 test -e "/*charset cp932 */; set character_set_client= cp932; select 'ƒ\'" --exec $MYSQL --default-character-set=utf8 test -e "/*charset cp932 */; set character_set_client= cp932; select '<EFBFBD>\'"
--exec $MYSQL --default-character-set=utf8 test -e "/*!\C cp932 */; set character_set_client= cp932; select 'ƒ\'" --exec $MYSQL --default-character-set=utf8 test -e "/*!\C cp932 */; set character_set_client= cp932; select '<EFBFBD>\'"
# #
# Bug#16859 -- NULLs in columns must not truncate data as if a C-language "string". # Bug#16859 -- NULLs in columns must not truncate data as if a C-language "string".