Commit 45d22e80 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-build 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
parents 2c8ef7c4 f4422bd4

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -131,10 +131,10 @@ ADD_SUBDIRECTORY(dbug) 
ADD_SUBDIRECTORY(strings)

ADD_SUBDIRECTORY(regex)

ADD_SUBDIRECTORY(mysys)

ADD_SUBDIRECTORY(zlib)

ADD_SUBDIRECTORY(extra/yassl)

ADD_SUBDIRECTORY(extra/yassl/taocrypt)

ADD_SUBDIRECTORY(extra)

ADD_SUBDIRECTORY(zlib)

ADD_SUBDIRECTORY(storage/heap)

ADD_SUBDIRECTORY(storage/myisam)

ADD_SUBDIRECTORY(storage/myisammrg)

Makefile.am

+22 −0
Original line number Diff line number Diff line
@@ -147,6 +147,28 @@ test-force-full: 
test-force-mem:

	$(MAKE) force=--force mem=--mem test



test-bt:

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --comment=normal --force --timer \

	--skip-ndbcluster --report-features

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl  --comment=ps    --force --timer \

	--skip-ndbcluster --ps-protocol

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --comment=normal+rowrepl --force --timer \

	--skip-ndbcluster --mysqld=--binlog-format=row

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --comment=ps+rowrepl+NDB --force --timer \

	--ps-protocol --mysqld=--binlog-format=row

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --comment=NDB            --force --timer \

	--with-ndbcluster-only



test-bt-debug:

	-cd mysql-test ; MTR_BUILD_THREAD=auto \

	@PERL@ ./mysql-test-run.pl --comment=debug  --force --timer \

	--skip-ndbcluster --skip-rpl --report-features



# Keep these for a while

test-pl:	test

test-full-pl:	test-full

client/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ ADD_EXECUTABLE(mysqladmin mysqladmin.cc) 
TARGET_LINK_LIBRARIES(mysqladmin mysqlclient mysys dbug yassl taocrypt zlib wsock32)



ADD_EXECUTABLE(mysqlslap mysqlslap.c)

SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")

TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys yassl taocrypt zlib wsock32 dbug)



ADD_EXECUTABLE(echo echo.c)

client/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ LDADD= @CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \ 
noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \

				client_priv.h



EXTRA_DIST =			get_password.c CMakeLists.txt

EXTRA_DIST =			get_password.c CMakeLists.txt echo.c



bin_PROGRAMS =			mysql \

				mysqladmin \
@@ -76,6 +76,7 @@ mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ 
mysqlshow_SOURCES=		mysqlshow.c



mysqlslap_SOURCES=		mysqlslap.c

mysqlslap_CFLAGS=		-DTHREAD -UUNDEF_THREADS_HACK

mysqlslap_LDADD =		$(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \

				@CLIENT_EXTRA_LDFLAGS@ \

				$(LIBMYSQLCLIENT_LA) \
@@ -96,7 +97,6 @@ DEFS = -DUNDEF_THREADS_HACK \ 


sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

strings_src=decimal.c

EXTRA_DIST =		get_password.c CMakeLists.txt echo.c



link_sources:

	for f in $(sql_src) ; do \

client/client_priv.h

+8 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ enum options_client 
  OPT_TRIGGERS,

  OPT_MYSQL_ONLY_PRINT,

  OPT_MYSQL_LOCK_DIRECTORY,

  OPT_MYSQL_SLAP_SLAVE,

  OPT_USE_THREADS,

  OPT_IMPORT_USE_THREADS,

  OPT_MYSQL_NUMBER_OF_QUERY,
@@ -58,6 +57,14 @@ enum options_client 
  OPT_TZ_UTC, OPT_AUTO_CLOSE, OPT_CREATE_SLAP_SCHEMA,

  OPT_SLAP_CSV, OPT_SLAP_CREATE_STRING,

  OPT_SLAP_AUTO_GENERATE_SQL_LOAD_TYPE, OPT_SLAP_AUTO_GENERATE_WRITE_NUM,

  OPT_SLAP_AUTO_GENERATE_ADD_AUTO,

  OPT_SLAP_AUTO_GENERATE_GUID_PRIMARY,

  OPT_SLAP_AUTO_GENERATE_EXECUTE_QUERIES,

  OPT_SLAP_AUTO_GENERATE_SECONDARY_INDEXES,

  OPT_SLAP_AUTO_GENERATE_UNIQUE_WRITE_NUM,

  OPT_SLAP_AUTO_GENERATE_UNIQUE_QUERY_NUM,

  OPT_SLAP_PRE_QUERY,

  OPT_SLAP_POST_QUERY,

  OPT_MYSQL_REPLACE_INTO, OPT_BASE64_OUTPUT, OPT_SERVER_ID,

  OPT_FIX_TABLE_NAMES, OPT_FIX_DB_NAMES, OPT_SSL_VERIFY_SERVER_CERT,

  OPT_DEBUG_INFO, OPT_COLUMN_TYPES