Commit 646deed9 authored by unknown's avatar unknown
Browse files

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

into deer.(none):/home/hf/work/mysql-4.1.clean
parents 29b3ae4d d3c5c499

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -940,3 +940,6 @@ ndbcluster-1186/ndb_3_out.log 
ndbcluster-1186/ndbcluster.pid

ndb/tools/ndb_restore

ac_available_languages_fragment

libmysqld/ha_archive.cc

libmysqld/ha_example.cc

libmysqld/ha_tina.cc

libmysqld/Makefile.am

+8 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ 
			-DDATADIR="\"$(MYSQLDATAdir)\"" \

			-DSHAREDIR="\"$(MYSQLSHAREdir)\""

INCLUDES=		@MT_INCLUDES@ @bdb_includes@ -I$(top_srcdir)/include \

			-I$(top_srcdir)/sql -I$(top_srcdir)/regex \

			-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples -I$(top_srcdir)/regex \

			$(openssl_includes) @ZLIB_INCLUDES@



noinst_LIBRARIES =	libmysqld_int.a
@@ -35,6 +35,7 @@ SUBDIRS = . examples 
libmysqld_sources=	libmysqld.c lib_sql.cc emb_qcache.cc

libmysqlsources =	errmsg.c get_password.c libmysql.c client.c pack.c \

                        my_time.c

sqlexamplessources =	ha_example.cc ha_archive.cc ha_tina.cc



noinst_HEADERS =	embedded_priv.h emb_qcache.h
@@ -59,7 +60,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \

	spatial.cc gstream.cc sql_help.cc tztime.cc



libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)

libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)

libmysqld_a_SOURCES=



# automake misses these
@@ -123,12 +124,16 @@ link_sources: 
	    rm -f $(srcdir)/$$f; \

	    @LN_CP_F@ $(srcdir)/../libmysql/$$f $(srcdir)/$$f; \

	  done; \

	  for f in $(sqlexamplessources); do \

	    rm -f $(srcdir)/$$f; \

	    @LN_CP_F@ $(srcdir)/../sql/examples/$$f $(srcdir)/$$f; \

	  done; \

	  rm -f $(srcdir)/client_settings.h; \

	  @LN_CP_F@ $(srcdir)/../libmysql/client_settings.h $(srcdir)/client_settings.h;





clean-local:

	rm -f `echo $(sqlsources) $(libmysqlsources) | sed "s;\.lo;.c;g"` \

	rm -f `echo $(sqlsources) $(libmysqlsources) $(sqlexamplessources) | sed "s;\.lo;.c;g"` \

	       $(top_srcdir)/linked_libmysqld_sources; \

	rm -f client_settings.h

mysql-test/mysql-test-run.sh

+7 −0
Original line number Diff line number Diff line
@@ -1387,13 +1387,18 @@ run_testcase () 
 # script soon anyway so it is not worth it spending the time

 if [ "x$USE_EMBEDDED_SERVER" = "x1" -a -z "$DO_TEST" ] ; then

   for t in \

        "alter_table" \

	"bdb-deadlock" \

	"connect" \

        "ctype_latin1_de" \

        "ctype_ucs" \

	"flush_block_commit" \

	"grant2" \

	"grant_cache" \

	"grant" \

	"init_connect" \

	"init_file" \

        "innodb" \

	"innodb-deadlock" \

	"innodb-lock" \

	"mix_innodb_myisam_binlog" \
@@ -1401,10 +1406,12 @@ run_testcase () 
	"mysqlbinlog" \

	"mysqldump" \

	"mysql_protocols" \

        "packet" \

	"ps_1general" \

	"rename" \

	"show_check" \

        "system_mysql_db_fix" \

        "timezone2" \

	"user_var" \

	"variables"

   do

mysql-test/r/ctype_big5.result.es

0 → 100644
+58 −0
Original line number Diff line number Diff line 
drop table if exists t1;

SET @test_character_set= 'big5';

SET @test_collation= 'big5_chinese_ci';

SET @safe_character_set_server= @@character_set_server;

SET @safe_collation_server= @@collation_server;

SET character_set_server= @test_character_set;

SET collation_server= @test_collation;

CREATE DATABASE d1;

USE d1;

CREATE TABLE t1 (c CHAR(10), KEY(c));

SHOW FULL COLUMNS FROM t1;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

c	char(10)	big5_chinese_ci	YES	MUL	NULL			

INSERT INTO t1 VALUES ('aaa'),('aaaa'),('aaaaa');

SELECT c as want3results FROM t1 WHERE c LIKE 'aaa%';

want3results

aaa

aaaa

aaaaa

DROP TABLE t1;

CREATE TABLE t1 (c1 varchar(15), KEY c1 (c1(2)));

SHOW FULL COLUMNS FROM t1;

Field	Type	Collation	Null	Key	Default	Extra	Privileges	Comment

c1	varchar(15)	big5_chinese_ci	YES	MUL	NULL			

INSERT INTO t1 VALUES ('location'),('loberge'),('lotre'),('boabab');

SELECT c1 as want3results from t1 where c1 like 'l%';

want3results

location

loberge

lotre

SELECT c1 as want3results from t1 where c1 like 'lo%';

want3results

location

loberge

lotre

SELECT c1 as want1result  from t1 where c1 like 'loc%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'loca%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'locat%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'locati%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'locatio%';

want1result

location

SELECT c1 as want1result  from t1 where c1 like 'location%';

want1result

location

DROP TABLE t1;

DROP DATABASE d1;

USE test;

SET character_set_server= @safe_character_set_server;

SET collation_server= @safe_collation_server;

mysql-test/r/ctype_recoding.result.es

0 → 100644
+242 −0
Original line number Diff line number Diff line 
SET CHARACTER SET koi8r;

DROP TABLE IF EXISTS , t1, t2;

SET CHARACTER SET koi8r;

CREATE TABLE t1 (a CHAR(10) CHARACTER SET cp1251) SELECT _koi8r'' AS a;

CREATE TABLE t2 (a CHAR(10) CHARACTER SET utf8);

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` char(10) character set cp1251 default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SELECT a FROM t1;

a



SELECT HEX(a) FROM t1;

HEX(a)

EFF0EEE1E0

INSERT t2 SELECT * FROM t1;

SELECT HEX(a) FROM t2;

HEX(a)

D0BFD180D0BED0B1D0B0

DROP TABLE t1, t2;

CREATE TABLE t1 (description text character set cp1250 NOT NULL);

INSERT INTO t1 (description) VALUES (_latin2'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasssssssssssaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddde');

SELECT description FROM t1;

description

aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaasssssssssssaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddde

DROP TABLE t1;

CREATE TABLE t1 (a TEXT CHARACTER SET cp1251) SELECT _koi8r'' AS a;

CREATE TABLE t2 (a TEXT CHARACTER SET utf8);

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` text character set cp1251

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SELECT HEX(a) FROM t1;

HEX(a)

EFF0EEE1E0

INSERT t2 SELECT * FROM t1;

SELECT HEX(a) FROM t2;

HEX(a)

D0BFD180D0BED0B1D0B0

DROP TABLE t1, t2;

CREATE TABLE ``

(

 CHAR(32) CHARACTER SET koi8r NOT NULL COMMENT " "

) COMMENT " ";

SHOW TABLES;

Tables_in_test



SHOW CREATE TABLE ;

Table	Create Table

	CREATE TABLE `` (

  `` char(32) character set koi8r NOT NULL default '' COMMENT ' '

) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT=' '

SHOW FIELDS FROM ;

Field	Type	Null	Key	Default	Extra

	char(32)				

SET CHARACTER SET cp1251;

SHOW TABLES;

Tables_in_test



SHOW CREATE TABLE ;

Table	Create Table

	CREATE TABLE `` (

  `` char(32) character set koi8r NOT NULL default '' COMMENT ' '

) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT=' '

SHOW FIELDS FROM ;

Field	Type	Null	Key	Default	Extra

	char(32)				

SET CHARACTER SET utf8;

SHOW TABLES;

Tables_in_test

таблица

SHOW CREATE TABLE таблица;

Table	Create Table

таблица	CREATE TABLE `таблица` (

  `поле` char(32) character set koi8r NOT NULL default '' COMMENT 'комментарий поля'

) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='комментарий таблицы'

SHOW FIELDS FROM таблица;

Field	Type	Null	Key	Default	Extra

поле	char(32)				

SET CHARACTER SET koi8r;

DROP TABLE ;

SET CHARACTER SET default;

SET NAMES UTF8;

CREATE TABLE t1 (t text) DEFAULT CHARSET UTF8;

INSERT INTO t1 (t) VALUES ('x');

SELECT 1 FROM t1 WHERE CONCAT(_latin1'x') = t;

1

1

DROP TABLE t1;

SET CHARACTER SET koi8r;

CREATE DATABASE ;

USE ;

SHOW TABLES;

Tables_in_тест

SHOW TABLES IN ;

Tables_in_тест

SET CHARACTER SET cp1251;

SHOW TABLES;

Tables_in_тест

SHOW TABLES IN ;

Tables_in_тест

SET CHARACTER SET koi8r;

DROP DATABASE ;

SET NAMES koi8r;

SELECT hex('');

hex('тест')

D4C5D3D4

SET character_set_connection=cp1251;

SELECT hex('');

hex('тест')

F2E5F1F2

USE test;

SET NAMES binary;

CREATE TABLE `тест` (`тест` int);

SHOW CREATE TABLE `тест`;

Table	Create Table

тест	CREATE TABLE `тест` (

  `тест` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SET NAMES utf8;

SHOW CREATE TABLE `тест`;

Table	Create Table

тест	CREATE TABLE `тест` (

  `тест` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

DROP TABLE `тест`;

SET NAMES binary;

SET character_set_connection=utf8;

SELECT 'тест' as s;

s

тест

SET NAMES utf8;

SET character_set_connection=binary;

SELECT 'тест' as s;

s

тест

SET NAMES latin1;

CREATE TABLE t1 (`` CHAR(128) DEFAULT '', `1` ENUM('1','2') DEFAULT '2');

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `` char(128) default '',

  `1` enum('1','2') default '2'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SHOW COLUMNS FROM t1;

Field	Type	Null	Key	Default	Extra

	char(128)	YES			

1	enum('1','2')	YES		2	

SET NAMES binary;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `ä` char(128) default 'ä',

  `ä1` enum('ä1','ä2') default 'ä2'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

SHOW COLUMNS FROM t1;

Field	Type	Null	Key	Default	Extra

ä	char(128)	YES		ä	

ä1	enum('ä1','ä2')	YES		ä2	

DROP TABLE t1;

SET NAMES binary;

CREATE TABLE `good` (a int);

ERROR HY000: Invalid utf8 character string: ''

SET NAMES utf8;

CREATE TABLE `good` (a int);

ERROR HY000: Invalid utf8 character string: '` (a int)'

set names latin1;

create table t1 (a char(10) character set koi8r, b text character set koi8r);

insert into t1 values ('test','test');

insert into t1 values ('','');

Warnings:

Warning	1265	Data truncated for column 'a' at row 1

Warning	1265	Data truncated for column 'b' at row 1

drop table t1;

set names koi8r;

create table t1 (a char(10) character set cp1251);

insert into t1 values (_koi8r'');

select * from t1 where a=_koi8r'';

a



select * from t1 where a=concat(_koi8r'');

ERROR HY000: Illegal mix of collations (cp1251_general_ci,IMPLICIT) and (koi8r_general_ci,COERCIBLE) for operation '='

select * from t1 where a=_latin1'';

ERROR HY000: Illegal mix of collations (cp1251_general_ci,IMPLICIT) and (latin1_swedish_ci,COERCIBLE) for operation '='

drop table t1;

set names latin1;

set names koi8r;

create table t1 (c1 char(10) character set cp1251);

insert into t1 values ('');

select c1 from t1 where c1 between '' and '';

c1



select ifnull(c1,''), ifnull(null,c1) from t1;

ifnull(c1,'ъ')	ifnull(null,c1)

	

select if(1,c1,''), if(0,c1,'') from t1;

if(1,c1,'Ж')	if(0,c1,'Ж')

	

select coalesce('',c1), coalesce(null,c1) from t1;

coalesce('Ж',c1)	coalesce(null,c1)

	

select least(c1,''), greatest(c1,'') from t1;

least(c1,'Ж')	greatest(c1,'Ж')

	

select locate(c1,''), locate('',c1) from t1;

locate(c1,'ъ')	locate('ъ',c1)

1	1

select field(c1,''),field('',c1) from t1;

field(c1,'ъ')	field('ъ',c1)

1	1

select concat(c1,''), concat('',c1) from t1;

concat(c1,'Ж')	concat('Ж',c1)

	

select concat_ws(c1,'',''), concat_ws('',c1,'') from t1;

concat_ws(c1,'Ж','ъ')	concat_ws('Ж',c1,'ъ')

	

select replace(c1,'',''), replace('',c1,'') from t1;

replace(c1,'ъ','Ж')	replace('ъ',c1,'Ж')

	

select substring_index(c1,'',2) from t1;

substring_index(c1,'ЖЖъъ',2)



select elt(1,c1,''),elt(1,'',c1) from t1;

elt(1,c1,'Ж')	elt(1,'Ж',c1)

	

select make_set(3,c1,''), make_set(3,'',c1) from t1;

make_set(3,c1,'Ж')	make_set(3,'Ж',c1)

,	,

select insert(c1,1,2,''),insert('',1,2,c1) from t1;

insert(c1,1,2,'Ж')	insert('Ж',1,2,c1)

	

select trim(c1 from ''),trim('' from c1) from t1;

trim(c1 from 'ъ')	trim('ъ' from c1)

	

select lpad(c1,3,''), lpad('',3,c1) from t1;

lpad(c1,3,'Ж')	lpad('Ж',3,c1)

	

select rpad(c1,3,''), rpad('',3,c1) from t1;

rpad(c1,3,'Ж')	rpad('Ж',3,c1)