diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-10-22 14:32:22 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-10-22 14:32:22 -0600 |
| commit | 50ff08918f45acc8eb85c4aeb50addaa68a2940c (patch) | |
| tree | dddc96b24ee2d5e7fe0a925d52f1f8e5e6104844 /libmysql | |
| parent | fc800ff76d0c1f47126645c7ec742ae07434056b (diff) | |
| parent | 91c6e5ceb2ed973c10201b72cdc880a1cd7b321a (diff) | |
| download | mariadb-git-50ff08918f45acc8eb85c4aeb50addaa68a2940c.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
sql/set_var.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
Diffstat (limited to 'libmysql')
| -rwxr-xr-x | libmysql/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libmysql/Makefile.shared | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 8471bbbd76c..cde23e8627e 100755 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -97,7 +97,7 @@ SET(CLIENT_SOURCES ../mysys/array.c ../strings/bchange.c ../strings/bmove.c ../strings/strmov.c ../strings/strnlen.c ../strings/strnmov.c ../strings/strtod.c ../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c ../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c - ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c + ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c ../mysys/mf_qsort.c ../mysys/my_getsystime.c ${LIB_SOURCES}) # Need to set USE_TLS for building the DLL, since __declspec(thread) diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 3a2559921f9..5887ea0eceb 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -73,7 +73,7 @@ sqlobjects = net.lo sql_cmn_objects = pack.lo client.lo my_time.lo # Not needed in the minimum library -mysysobjects2 = my_lib.lo +mysysobjects2 = my_lib.lo mf_qsort.lo mysysobjects = $(mysysobjects1) $(mysysobjects2) target_libadd = $(mysysobjects) $(mystringsobjects) $(dbugobjects) \ $(sql_cmn_objects) $(vio_objects) $(sqlobjects) |