Commit 196d6f34 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/mysql_src/mysql-4.1-clean


mysql-test/r/ctype_ucs.result:
  Auto merged
parents d62ca959 85a6647f

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 4.1.9)

AM_INIT_AUTOMAKE(mysql, 4.1.10)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

libmysql/libmysql.def

+1 −0
Original line number Diff line number Diff line
@@ -146,3 +146,4 @@ EXPORTS 
	mysql_rpl_query_type

	mysql_slave_query

	mysql_embedded

	get_defaults_files

libmysqld/libmysqld.def

+1 −0
Original line number Diff line number Diff line
@@ -157,3 +157,4 @@ EXPORTS 
	mysql_stmt_attr_get

	mysql_stmt_attr_set

	mysql_stmt_field_count

	get_defaults_files

mysql-test/include/ctype_filesort.inc

0 → 100644
+15 −0
Original line number Diff line number Diff line 
#

# Set desired charset_connection and collation_collation

# before including this file.

#



# The next query creates a LONGTEXT column

# using the current character_set_connection

# and collation_connection.



create table t1 select repeat('a',4000) a;

delete from t1;



insert into t1 values ('a'), ('a '), ('a\t');

select collation(a),hex(a) from t1 order by a;

drop table t1;

mysql-test/r/ctype_big5.result

+21 −0
Original line number Diff line number Diff line
@@ -56,3 +56,24 @@ DROP DATABASE d1; 
USE test;

SET character_set_server= @safe_character_set_server;

SET collation_server= @safe_collation_server;

SET NAMES big5;

SET collation_connection='big5_chinese_ci';

create table t1 select repeat('a',4000) a;

delete from t1;

insert into t1 values ('a'), ('a '), ('a\t');

select collation(a),hex(a) from t1 order by a;

collation(a)	hex(a)

big5_chinese_ci	6109

big5_chinese_ci	61

big5_chinese_ci	6120

drop table t1;

SET collation_connection='big5_bin';

create table t1 select repeat('a',4000) a;

delete from t1;

insert into t1 values ('a'), ('a '), ('a\t');

select collation(a),hex(a) from t1 order by a;

collation(a)	hex(a)

big5_bin	6109

big5_bin	61

big5_bin	6120

drop table t1;