diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-01-30 16:43:23 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-01-30 16:43:23 +0200 |
| commit | 2e75dda33ebc7468f777f55e403c1d40a00ec0e0 (patch) | |
| tree | b9ebb0c9950f8fa52958d1198e6df31c21cee7a3 /client | |
| parent | 4e17ec5a298b118e7f86df8d470abf06d3d5dbad (diff) | |
| parent | 5bcf3a242c753449dde504a1a27712ad48b3ed8c (diff) | |
| download | mariadb-git-2e75dda33ebc7468f777f55e403c1d40a00ec0e0.tar.gz | |
Merge with 5.1
Fixed a couple of compilation failures that was not detected before merge.
Diffstat (limited to 'client')
| -rw-r--r-- | client/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index a491ce364b6..1f2644f1e79 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -106,7 +106,7 @@ sql_src=log_event.h mysql_priv.h rpl_constants.h \ log_event.cc my_decimal.h my_decimal.cc \ log_event_old.h log_event_old.cc \ rpl_record_old.h rpl_record_old.cc -strings_src=decimal.c +strings_src=decimal.c strings_def.h link_sources: for f in $(sql_src) ; do \ |