diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-12-07 03:56:03 -0700 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-12-07 03:56:03 -0700 |
| commit | 284cb0e560293187b9d2d7a38aa71de9d9637567 (patch) | |
| tree | b719b75e443bf2787a2c520cc6e9955e4eb6a4a8 /libmysql | |
| parent | b5f919ddfa3bfe6202302bb3e88e252c68550ed7 (diff) | |
| parent | 6e776686d4cbaac919eee8300b2c85e2cf5825ec (diff) | |
| download | mariadb-git-284cb0e560293187b9d2d7a38aa71de9d9637567.tar.gz | |
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/grant.result:
Manual merge
mysql-test/t/grant.test:
Manual merge
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 40e321060bb..249e6294c22 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 02855532e41..53b24c4fb42 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) |