diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-05-28 19:13:31 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-05-28 19:13:31 -0300 |
| commit | 1164841167ce62d213fd0084aad376be8fcc371b (patch) | |
| tree | eef16fecac880a9779e086028ad9f933d3e53c6d /client | |
| parent | 92f659e7a34153b2eed6340356ac505704567c7c (diff) | |
| download | mariadb-git-1164841167ce62d213fd0084aad376be8fcc371b.tar.gz | |
Backport: Remove unused and ancient files, functions, and facilities.
client/mysql.cc:
Remove unused functions.
client/sql_string.cc:
Remove unused functions.
include/my_pthread.h:
Remove unused prototype.
mysys/my_pthread.c:
Remove unused function.
sql/lock.cc:
Remove unused function.
sql/lock.h:
Remove unused and duplicated prototypes.
sql/sql_class.h:
Removed unused variables.
sql/sql_const.h:
Remove unused defines.
sql/sql_priv.h:
Remove unused defines.
sql/sql_string.cc:
Remove unused prototype.
sql/thr_malloc.cc:
Remove unused function.
sql/thr_malloc.h:
Remove unused prototype.
storage/myisam/CMakeLists.txt:
Remove obsolete fulltext file.
storage/myisam/Makefile.am:
Remove obsolete files (were already commented out).
storage/myisam/ft_eval.c:
Remove obsolete fulltext file.
storage/myisam/ft_eval.h:
Remove obsolete fulltext file.
storage/myisam/ft_stem.c:
Remove obsolete fulltext file.
storage/myisam/ft_test1.c:
Remove obsolete fulltext file.
storage/myisam/ft_test1.h:
Remove obsolete fulltext file.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 16 | ||||
| -rw-r--r-- | client/sql_string.cc | 7 |
2 files changed, 0 insertions, 23 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 86094edc039..4a7a8f0e58c 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -59,8 +59,6 @@ static char *server_version= NULL; /* Array of options to pass to libemysqld */ #define MAX_SERVER_ARGS 64 -void* sql_alloc(unsigned size); // Don't use mysqld alloc for these -void sql_element_free(void *ptr); #include "sql_string.h" extern "C" { @@ -4963,17 +4961,3 @@ static int com_prompt(String *buffer, char *line) tee_fprintf(stdout, "PROMPT set to '%s'\n", current_prompt); return 0; } - -#ifndef EMBEDDED_LIBRARY -/* Keep sql_string library happy */ - -void *sql_alloc(size_t Size) -{ - return my_malloc(Size,MYF(MY_WME)); -} - -void sql_element_free(void *ptr) -{ - my_free(ptr,MYF(0)); -} -#endif /* EMBEDDED_LIBRARY */ diff --git a/client/sql_string.cc b/client/sql_string.cc index ccbc8977e7f..6b749409a64 100644 --- a/client/sql_string.cc +++ b/client/sql_string.cc @@ -24,13 +24,6 @@ #include <m_string.h> #include <m_ctype.h> #include <mysql_com.h> -/* - The following extern declarations are ok as these are interface functions - required by the string function -*/ - -extern void sql_alloc(size_t size); -extern void sql_element_free(void *ptr); #include "sql_string.h" |