diff options
| author | unknown <kaa@polly.(none)> | 2007-10-18 13:47:35 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-10-18 13:47:35 +0400 |
| commit | 85f9df837c88fe748a300bd9db8d8c28fdc72cb6 (patch) | |
| tree | dc3c1e3e5d9a50be6f46d86dbb366417a111716c /libmysql | |
| parent | a634d1bf474aab88c44d448035b6a9a35d6e795d (diff) | |
| parent | ce8bf087b0abe3a1cae976a26cac5368a93ba1a7 (diff) | |
| download | mariadb-git-85f9df837c88fe748a300bd9db8d8c28fdc72cb6.tar.gz | |
Merge polly.(none):/home/kaa/src/maint/bug31207/my50-bug31174
into polly.(none):/home/kaa/src/maint/mysql-5.0-maint
myisam/sort.c:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.shared | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index dc6d658fcdf..5947ae26486 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) |