diff options
| author | Konstantin Osipov <kostja@sun.com> | 2010-02-05 01:08:08 +0300 |
|---|---|---|
| committer | Konstantin Osipov <kostja@sun.com> | 2010-02-05 01:08:08 +0300 |
| commit | e7b332ba83f7ecd5dbc518df5d5f4c84fc542552 (patch) | |
| tree | a1d34e4650281143b62067088c8965f2cceacb2d /client | |
| parent | 00dc9a6e70512905ef441274b0574fd2503f15b1 (diff) | |
| parent | 08bcd2d8f67dcacd36abd2592fa2a59321abe7c2 (diff) | |
| download | mariadb-git-e7b332ba83f7ecd5dbc518df5d5f4c84fc542552.tar.gz | |
Merge next-mr -> next-4284.
Diffstat (limited to 'client')
| -rw-r--r-- | client/Makefile.am | 3 | ||||
| -rw-r--r-- | client/mysqlbinlog.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index feb71a491e4..1cd85c5840a 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -104,10 +104,11 @@ DEFS = -DMYSQL_CLIENT_NO_THREADS \ -DMYSQL_DATADIR="\"$(localstatedir)\"" sql_src=log_event.h mysql_priv.h rpl_constants.h \ - rpl_utility.h rpl_tblmap.h rpl_tblmap.cc \ + rpl_tblmap.h rpl_tblmap.cc \ 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 \ + rpl_utility.h rpl_utility.cc \ transaction.h strings_src=decimal.c dtoa.c diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 1fb56fae076..dae6b36eeb2 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -2140,4 +2140,4 @@ int main(int argc, char** argv) #include "my_decimal.cc" #include "log_event.cc" #include "log_event_old.cc" - +#include "rpl_utility.cc" |