Commit b4e0ce56 authored by unknown's avatar unknown
Browse files

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

into igor-inspiron.creware.com:/home/igor/mysql-4.1
parents b28b0bf4 86f46a34

VC++Files/tests/mysql_client_test.dsp

+6 −6
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ RSC=rc.exe 
# PROP Output_Dir ".\Debug"

# PROP Intermediate_Dir ".\Debug"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_client_test.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX 

# ADD CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_client_test.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /c /GX 

# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_client_test.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /FD /c /GX 

# ADD CPP /nologo /MTd /I "../include" /I "../" /Z7 /W3 /Od /G6 /D "_DEBUG" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /Fp".\Debug/mysql_client_test.pch" /Fo".\Debug/" /Fd".\Debug/" /GZ /FD /c /GX 

# ADD BASE MTL /nologo /tlb".\Debug\mysql_client_test.tlb" /win32 

# ADD MTL /nologo /tlb".\Debug\mysql_client_test.tlb" /win32 

# ADD BASE RSC /l 1033
@@ -66,8 +66,8 @@ LINK32=link.exe 
# PROP Output_Dir ".\Release"

# PROP Intermediate_Dir ".\Release"

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

# ADD CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_client_test.pch" /Fo".\Release/" /Fd".\Release/" /c /GX 

# ADD BASE CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_client_test.pch" /Fo".\Release/" /Fd".\Release/" /FD /c /GX 

# ADD CPP /nologo /MTd /I "../include" /I "../" /W3 /Ob1 /G6 /D "DBUG_OFF" /D "_WINDOWS" /D "SAFE_MUTEX" /D "USE_TLS" /D "MYSQL_CLIENT" /D "__WIN__" /D "_WIN32" /GF /Gy /Fp".\Release/mysql_client_test.pch" /Fo".\Release/" /Fd".\Release/" /FD /c /GX 

# ADD BASE MTL /nologo /tlb".\Release\mysql_client_test.tlb" /win32 

# ADD MTL /nologo /tlb".\Release\mysql_client_test.tlb" /win32 

# ADD BASE RSC /l 1033
@@ -76,8 +76,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo 

# ADD BSC32 /nologo 

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\client_release\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib /nologo /out:"..\client_release\mysql_client_test.exe" /incremental:no /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib /nologo /out:"..\client_release\mysql_client_test.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 

# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib odbc32.lib odbccp32.lib Ws2_32.lib mysqlclient.lib mysys.lib regex.lib /nologo /out:"..\client_release\mysql_client_test.exe" /incremental:no /libpath:"..\lib_release\" /pdb:".\Release\mysql_client_test.pdb" /pdbtype:sept /subsystem:console 



!ENDIF

include/my_global.h

+1 −4
Original line number Diff line number Diff line
@@ -375,10 +375,7 @@ int __void__; 
#endif



/* Define some useful general macros */

#if defined(__cplusplus) && defined(__GNUC__)

#define max(a, b)	((a) >? (b))

#define min(a, b)	((a) <? (b))

#elif !defined(max)

#if !defined(max)

#define max(a, b)	((a) > (b) ? (a) : (b))

#define min(a, b)	((a) < (b) ? (a) : (b))

#endif

mysql-test/Makefile.am

+0 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ mysql_test_run_new_SOURCES= mysql_test_run_new.c my_manage.c my_create_tables.c 
dist-hook:

	mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \

		$(distdir)/std_data $(distdir)/lib

	$(INSTALL_DATA) $(srcdir)/t/*.def $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.test $(srcdir)/t/*.opt $(srcdir)/t/*.sh $(srcdir)/t/*.slave-mi $(distdir)/t

	$(INSTALL_DATA) $(srcdir)/include/*.inc $(distdir)/include

	$(INSTALL_DATA) $(srcdir)/r/*.result $(srcdir)/r/*.require $(distdir)/r
@@ -68,7 +67,6 @@ install-data-local: 
		$(DESTDIR)$(testdir)/std_data \

		$(DESTDIR)$(testdir)/lib

	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(testdir)

	$(INSTALL_DATA) $(srcdir)/t/*.def $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.test $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.opt $(DESTDIR)$(testdir)/t

	$(INSTALL_DATA) $(srcdir)/t/*.sh $(DESTDIR)$(testdir)/t

mysql-test/r/ctype_utf8.result

+11 −0
Original line number Diff line number Diff line
@@ -939,6 +939,17 @@ content msisdn 
ERR Имри.Афимим.Аеимимримдмримрмрирор имримримримр имридм ирбднримрфмририримрфмфмим.Ад.Д имдимримрад.Адимримримрмдиримримримр м.Дадимфшьмримд им.Адимимрн имадми	1234567890

11 g	1234567890

DROP TABLE t1,t2;

create table t1 (a char(20) character set utf8);

insert into t1 values ('123456'),('андрей');

alter table t1 modify a char(2) character set utf8;

Warnings:

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

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

select char_length(a), length(a), a from t1 order by a;

char_length(a)	length(a)	a

2	2	12

2	4	ан

drop table t1;

CREATE TABLE t1 (

a varchar(255) NOT NULL default '',

KEY a (a)

mysql-test/t/ctype_utf8.test

+10 −0
Original line number Diff line number Diff line
@@ -789,6 +789,16 @@ SELECT content, t2.msisdn FROM t1, t2 WHERE t1.msisdn = '1234567890'; 


DROP TABLE t1,t2;



#

# Bug#11591: CHAR column with utf8 does not work properly

# (more chars than expected)

#

create table t1 (a char(20) character set utf8);

insert into t1 values ('123456'),('андрей');

alter table t1 modify a char(2) character set utf8;

select char_length(a), length(a), a from t1 order by a;

drop table t1;



#

# Bug#9557 MyISAM utf8 table crash

#