Commit 9ae84f70 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/mysql-test-run.pl:
  Merge locationwhere to search for client bins
parents 7c66333a c330dc83

VC++Files/libmysqld/libmysqld.vcproj

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ 
				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include,../libmysqld,../sql,../regex,../extra/yassl/include,../storage/bdb/build_win32,../zlib"

				PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;NDEBUG;DBUG_OFF;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;WITH_INNOBASE_STORAGE_ENGINE;USE_TLS;__WIN__"/>

				PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;NDEBUG;DBUG_OFF;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;WITH_INNOBASE_STORAGE_ENGINE;USE_TLS;__WIN__"

				StringPooling="TRUE"

				RuntimeLibrary="0"

				EnableFunctionLevelLinking="TRUE"

client/mysqlbinlog.cc

+1 −1
Original line number Diff line number Diff line
@@ -1497,7 +1497,7 @@ int main(int argc, char** argv) 
  the server

*/



#ifdef __WIN__

#if defined(__WIN__) && !defined(USING_CMAKE)

#include "my_decimal.h"

#include "decimal.c"

#include "my_decimal.cpp"

mysql-test/extra/rpl_tests/rpl_row_001.test

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
-- source include/have_binlog_format_row.inc



CREATE TABLE t1 (word CHAR(20) NOT NULL);

LOAD DATA INFILE '../../std_data/words.dat' INTO TABLE t1;

LOAD DATA INFILE '../std_data_ln/words.dat' INTO TABLE t1;

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

eval LOAD DATA LOCAL INFILE '$MYSQL_TEST_DIR/std_data/words.dat' INTO TABLE t1;

SELECT * FROM t1  ORDER BY word LIMIT 10;

mysql-test/extra/rpl_tests/rpl_row_UUID.test

+3 −3
Original line number Diff line number Diff line
@@ -56,8 +56,8 @@ SHOW CREATE TABLE test.t1; 
# then LOAD DATA INFILE in slave, and use a query to compare.

# This would have the advantage that it would not assume

# the system has a 'diff'

--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_UUID_master.sql

--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_UUID_slave.sql

--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_master.sql

--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_slave.sql



connection master;

# Let's cleanup
@@ -72,7 +72,7 @@ DROP TABLE test.t2; 
# will be created. You will need to go to the mysql-test dir and diff

# the files your self to see what is not matching :-)



--exec diff ./var/tmp/rpl_row_UUID_master.sql ./var/tmp/rpl_row_UUID_slave.sql;

--exec diff $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_master.sql $MYSQLTEST_VARDIR/tmp/rpl_row_UUID_slave.sql;



# Cleanup dump files.

# Long-term "system rm" is not portable; we could live without

mysql-test/extra/rpl_tests/rpl_row_blob.test

+3 −3
Original line number Diff line number Diff line
@@ -176,10 +176,10 @@ connection master; 
--echo



# Post test clean up section

--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_blob_master.sql

--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > ./var/tmp/rpl_row_blob_slave.sql

--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_blob_master.sql

--exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/rpl_row_blob_slave.sql



--exec diff ./var/tmp/rpl_row_blob_master.sql ./var/tmp/rpl_row_blob_slave.sql

--exec diff $MYSQLTEST_VARDIR/tmp/rpl_row_blob_master.sql $MYSQLTEST_VARDIR/tmp/rpl_row_blob_slave.sql



DROP TABLE IF EXISTS test.t1;

DROP TABLE IF EXISTS test.t2;