Commit e36d66da authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch


mysql-test/mysql-test-run.pl:
  Auto merged
parents a79e08a6 c8e15cf2

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)

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

+1 −0
Original line number Diff line number Diff line
@@ -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) \

client/client_priv.h

+6 −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,12 @@ 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_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

client/mysqlslap.c

+899 −295

File changed.

Preview size limit exceeded, changes collapsed.