summaryrefslogtreecommitdiff
path: root/sql/sql_string.cc
diff options
context:
space:
mode:
authorAlexander Ivanov <alexi1952@yandex.ru>2009-10-16 15:20:09 +0400
committerAlexander Ivanov <alexi1952@yandex.ru>2009-10-16 15:20:09 +0400
commit6bc7eab161508115168359460b9d52aff153dbaf (patch)
tree51ca9db10993d7cc1a7697149266bbaf702e0657 /sql/sql_string.cc
parent8ea19fa73e86a3c27917a92affd6a9e43763c7ce (diff)
downloadmariadb-git-6bc7eab161508115168359460b9d52aff153dbaf.tar.gz
MWL#36: Add a mysqlbinlog option to change the used database.
Make sql_alloc() declaration "public" for a client context. The reason is that sql_alloc() is used in definition of some common purpose stuff (e.g. sql_list.*). To make this stuff available for a client context we declare sql_alloc() as a "virtual function", i.e. as a function that is already declared but must be defined in this context (note that definition of sql_alloc() in thr_malloc.cc is #ifndef'ed for MYSQL_CLIENT). Also make sql_string.h repeatedly includable.
Diffstat (limited to 'sql/sql_string.cc')
-rw-r--r--sql/sql_string.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc
index e9927c8e85c..a326e8a7ef0 100644
--- a/sql/sql_string.cc
+++ b/sql/sql_string.cc
@@ -26,15 +26,6 @@
#ifdef HAVE_FCONVERT
#include <floatingpoint.h>
#endif
-
-/*
- The following extern declarations are ok as these are interface functions
- required by the string function
-*/
-
-extern uchar* sql_alloc(unsigned size);
-extern void sql_element_free(void *ptr);
-
#include "sql_string.h"
/*****************************************************************************