diff options
| author | unknown <brian@zim.tangent.org> | 2006-02-19 09:41:59 -0800 |
|---|---|---|
| committer | unknown <brian@zim.tangent.org> | 2006-02-19 09:41:59 -0800 |
| commit | 99502158b7dca8bc5be4a52ecf30a671739a6b84 (patch) | |
| tree | d05f774b368556fbf12cea7bddef5d6e079d6fd2 /client/Makefile.am | |
| parent | 309f51cd28625316f2eb2ad34ba0f95b0d986264 (diff) | |
| download | mariadb-git-99502158b7dca8bc5be4a52ecf30a671739a6b84.tar.gz | |
Fixed some threading issues that Guilhem found (and its what I get for copy and pasting from elsewhere without thinking about it). Added depracted messages to BACKUP, RESTORE, and LOAD TABLE FROM MASTER (which doesn't work well).
client/Makefile.am:
Added threaded libary.
client/mysqlimport.c:
Updated logic to use threaded libmysql correctly.
client/mysqlslap.c:
Modified how threads were working.
mysql-test/r/backup.result:
Added deprecated messages.
sql/sql_yacc.yy:
Added deprecated messages to RESTORE, BACKUP, and LOAD TABLE FROM MASTER
Diffstat (limited to 'client/Makefile.am')
| -rw-r--r-- | client/Makefile.am | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 14ebadbfacb..0f702d90c4d 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -48,15 +48,19 @@ mysqlbinlog_SOURCES = mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c \ $(top_srcdir)/mysys/my_vle.c \ $(top_srcdir)/mysys/base64.c mysqlbinlog_LDADD = $(LDADD) $(CXXLDFLAGS) -mysqlslap_LDADD = $(LDADD) $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) -mysqlimport_LDADD = $(LDADD) $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ +mysqlslap_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ + @CLIENT_EXTRA_LDFLAGS@ \ + $(top_builddir)/libmysql_r/libmysqlclient_r.la \ + $(top_builddir)/mysys/libmysys.a +mysqlimport_LDADD = $(CXXLDFLAGS) $(CLIENT_THREAD_LIBS) \ + @CLIENT_EXTRA_LDFLAGS@ \ + $(top_builddir)/libmysql_r/libmysqlclient_r.la \ $(top_builddir)/mysys/libmysys.a mysqltestmanager_pwgen_SOURCES = mysqlmanager-pwgen.c mysqltestmanagerc_SOURCES= mysqlmanagerc.c $(yassl_dummy_link_fix) mysqlcheck_SOURCES= mysqlcheck.c $(yassl_dummy_link_fix) mysqlshow_SOURCES= mysqlshow.c $(yassl_dummy_link_fix) -mysqlslap_SOURCES= mysqlslap.c $(top_srcdir)/mysys/my_lock.c \ - $(top_srcdir)/mysys/my_alarm.c \ +mysqlslap_SOURCES= mysqlslap.c \ $(yassl_dummy_link_fix) mysqldump_SOURCES= mysqldump.c my_user.c $(yassl_dummy_link_fix) mysqlimport_SOURCES= mysqlimport.c \ |