summaryrefslogtreecommitdiff
path: root/sql/sql_client.cc
diff options
context:
space:
mode:
authorunknown <hf@deer.(none)>2003-12-18 15:51:22 +0400
committerunknown <hf@deer.(none)>2003-12-18 15:51:22 +0400
commit886307f28275c29e2ca1e833081d2c4a01ef10b7 (patch)
tree2785059bf0f530b8d1cff70378904178e52fb05e /sql/sql_client.cc
parent69cee79246feab6844f52a1e1244704d3741bde3 (diff)
downloadmariadb-git-886307f28275c29e2ca1e833081d2c4a01ef10b7.tar.gz
Fix for #2126 (mysql_server_init call shouldn't be needed)
now mysql_server_init is called from mysql_init with fake parameters mysql_once_init code included to mysql_server_init. embedded-specific initialization is in init_embedded_server function include/errmsg.h: this error won't happen include/mysql.h: declarations removed libmysql/client_settings.h: declaration of init_embedded_server/end_embedded_server added libmysql/errmsg.c: this error won't happen libmysql/libmysql.c: mysql_once_init -> mysql_server_init transformations libmysqld/embedded_priv.h: declaration deleted libmysqld/lib_sql.cc: mysql_server_init -> init_embedded_server mysql_server_end -> end_embedded_server libmysqld/libmysqld.c: check for server_inited not needed now sql-common/client.c: mysql_server_init now called from mysql_init sql/client_settings.h: fake mysql_server_init for server code sql/net_serv.cc: we need MYSQL_CLIENT defined in embedded server sql/sql_client.cc: not needed now
Diffstat (limited to 'sql/sql_client.cc')
-rw-r--r--sql/sql_client.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/sql_client.cc b/sql/sql_client.cc
index 1ae9a23a924..9f3063cde2d 100644
--- a/sql/sql_client.cc
+++ b/sql/sql_client.cc
@@ -38,8 +38,3 @@ void my_net_local_init(NET *net)
}
}
-extern "C" {
-void mysql_once_init(void)
-{
-}
-}