Commit cb88f63e authored by istruewing@chilla.local's avatar istruewing@chilla.local
Browse files

Merge chilla.local:/home/mydev/mysql-5.0-ateam 

into  chilla.local:/home/mydev/mysql-5.0-axmrg
parents 1ac28cd7 db649ad5

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -1341,3 +1341,6 @@ win/vs71cache.txt 
win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj

debian/control

debian/defs.mk

include/abi_check

BUILD/compile-pentium-gcov

+3 −2
Original line number Diff line number Diff line
@@ -13,8 +13,9 @@ export LDFLAGS="-fprofile-arcs -ftest-coverage" 


# The  -fprofile-arcs and -ftest-coverage options cause GCC to instrument the

# code with profiling information used by gcov.

# the -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.

extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM $debug_cflags $max_cflags -DMYSQL_SERVER_SUFFIX=-gcov"

# The -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.

# The -DHAVE_gcov enables code to write out coverage info even when crashing.

extra_flags="$pentium_cflags -fprofile-arcs -ftest-coverage -DDISABLE_TAO_ASM $debug_cflags $max_cflags -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov"

c_warnings="$c_warnings $debug_extra_warnings"

cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs --disable-shared $static_link"

libmysql/libmysql.c

+15 −0
Original line number Diff line number Diff line
@@ -168,8 +168,23 @@ int STDCALL mysql_server_init(int argc __attribute__((unused)), 
}





/*

  Free all memory and resources used by the client library



  NOTES

    When calling this there should not be any other threads using

    the library.



    To make things simpler when used with windows dll's (which calls this

    function automaticly), it's safe to call this function multiple times.

*/





void STDCALL mysql_server_end()

{

  if (!mysql_client_init)

    return;



#ifdef EMBEDDED_LIBRARY

  end_embedded_server();

#endif

mysql-test/r/fulltext2.result

+0 −12
Original line number Diff line number Diff line
@@ -241,15 +241,3 @@ select * from t1 where match a against('ab c' in boolean mode); 
a

drop table t1;

set names latin1;
 
CREATE TABLE t1(a VARCHAR(255) CHARACTER SET gbk, FULLTEXT(a));

SET NAMES utf8;

INSERT INTO t1 VALUES(0xF043616161),(0xBEF361616197C22061616161);

SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST(0x97C22061616161 IN BOOLEAN MODE);

HEX(a)

BEF361616197C22061616161

DELETE FROM t1 LIMIT 1;

CHECK TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

SET NAMES latin1;

DROP TABLE t1;

mysql-test/r/fulltext3.result

0 → 100644
+13 −0
Original line number Diff line number Diff line 
DROP TABLE IF EXISTS t1;

CREATE TABLE t1(a VARCHAR(255) CHARACTER SET gbk, FULLTEXT(a));

SET NAMES utf8;

INSERT INTO t1 VALUES(0xF043616161),(0xBEF361616197C22061616161);

SELECT HEX(a) FROM t1 WHERE MATCH(a) AGAINST(0x97C22061616161 IN BOOLEAN MODE);

HEX(a)

BEF361616197C22061616161

DELETE FROM t1 LIMIT 1;

CHECK TABLE t1;

Table	Op	Msg_type	Msg_text

test.t1	check	status	OK

SET NAMES latin1;

DROP TABLE t1;