diff options
| author | Alexander Ivanov <alexi1952@yandex.ru> | 2009-10-16 19:08:24 +0400 |
|---|---|---|
| committer | Alexander Ivanov <alexi1952@yandex.ru> | 2009-10-16 19:08:24 +0400 |
| commit | f7526c063ee4875d0b724cfa600921edf13425cf (patch) | |
| tree | 1095730043b21bf8f5ca3a63d764320411ce087f /sql/sql_string.cc | |
| parent | 56af9edf1ab697c2628654e6b51de16616e2dd0b (diff) | |
| parent | 75a949fb414f8b3ed851a466d84788085c9dbe42 (diff) | |
| download | mariadb-git-f7526c063ee4875d0b724cfa600921edf13425cf.tar.gz | |
MWL#36: Add a mysqlbinlog option to change the used database.
Merge from trunk.
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index a326e8a7ef0..601343a73ce 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -26,6 +26,10 @@ #ifdef HAVE_FCONVERT #include <floatingpoint.h> #endif +<<<<<<< TREE +======= + +>>>>>>> MERGE-SOURCE #include "sql_string.h" /***************************************************************************** |