database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

After merge

Browse Source
This commit is contained in:
Alexander Ivanov
2009-10-17 10:12:57 +04:00
parent f7526c063e
commit 3ea974ad2f
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_string.cc
View File

@ -26,10 +26,6 @@
#ifdef HAVE_FCONVERT #ifdef HAVE_FCONVERT
#include <floatingpoint.h> #include <floatingpoint.h>
#endif #endif
<<<<<<< TREE
=======
>>>>>>> MERGE-SOURCE
#include "sql_string.h" #include "sql_string.h"
/***************************************************************************** /*****************************************************************************