mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
14decc4fbc
(Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #) BitKeeper/etc/ignore: added mysql-test/r/*.warnings BUILD/SETUP.sh: Don't build with BDB as default client/client_priv.h: Added OPT_DEBUG_INFO client/mysqlbinlog.cc: Fixed compiler warning client/mysqldump.c: Removed compiler warnings Added option --debug-info to detect memory leaks Fixed memory leak Don't backup cluster replication tables (if used with 5.1) cmd-line-utils/readline/bind.c: Fixed compiler warning cmd-line-utils/readline/chardefs.h: Fixed compiler warning cmd-line-utils/readline/complete.c: Fixed compiler warning cmd-line-utils/readline/display.c: Fixed compiler warning cmd-line-utils/readline/histexpand.c: Fixed compiler warning cmd-line-utils/readline/input.c: Fixed compiler warning cmd-line-utils/readline/isearch.c: Fixed compiler warning cmd-line-utils/readline/kill.c: Fixed compiler warning cmd-line-utils/readline/macro.c: Fixed compiler warning cmd-line-utils/readline/misc.c: Fixed compiler warning cmd-line-utils/readline/nls.c: Fixed compiler warning cmd-line-utils/readline/readline.c: Fixed compiler warning cmd-line-utils/readline/rltty.c: Fixed compiler warning cmd-line-utils/readline/search.c: Fixed compiler warning cmd-line-utils/readline/terminal.c: Fixed compiler warning cmd-line-utils/readline/text.c: Fixed compiler warning cmd-line-utils/readline/tilde.c: Fixed compiler warning cmd-line-utils/readline/undo.c: Fixed compiler warning cmd-line-utils/readline/util.c: Fixed compiler warning cmd-line-utils/readline/vi_mode.c: Fixed compiler warning dbug/dbug_analyze.c: Fixed compiler warning extra/yassl/src/ssl.cpp: Fixed compiler warning extra/yassl/testsuite/testsuite.cpp: Fixed compiler warning heap/_check.c: Fixed compiler warning heap/hp_delete.c: Fixed compiler warning heap/hp_hash.c: Fixed compiler warning heap/hp_open.c: Fixed compiler warning heap/hp_rkey.c: Fixed compiler warning heap/hp_rrnd.c: Fixed compiler warning heap/hp_write.c: Fixed compiler warning libmysql/libmysql.c: Fixed compiler warning libmysqld/libmysqld.c: Fixed compiler warning myisam/mi_close.c: Fixed compiler warning myisam/mi_delete.c: Fixed compiler warning myisam/mi_dynrec.c: Fixed compiler warning myisam/mi_keycache.c: Fixed compiler warning myisam/mi_page.c: Fixed compiler warning myisam/mi_statrec.c: Fixed compiler warning myisam/mi_test2.c: Fixed compiler warning myisam/mi_write.c: Fixed compiler warning myisam/myisampack.c: Fixed compiler warning myisammrg/myrg_extra.c: Fixed compiler warning mysql-test/mysql-test-run.pl: Remove .reject, .progress, .log and .warnings flag at start cluster -> mysql database (for 5.1) mysql-test/include/federated.inc: Remove mysqltest warnings mysql-test/include/sp-vars.inc: Remove mysqltest warnings mysql-test/mysql-test-run.sh: Fix so that 'make test' works again Remove .reject, .progress .log and .warnings files at startup mysql-test/r/ctype_cp1250_ch.result: Drop used tables at startup mysql-test/t/create.test: Remove mysqltest warnings mysql-test/t/csv.test: Remove mysqltest warnings mysql-test/t/ctype_collate.test: Remove mysqltest warnings mysql-test/t/ctype_cp1250_ch.test: Drop used tables at startup mysql-test/t/ctype_ucs.test: Remove mysqltest warnings mysql-test/t/func_sapdb.test: Remove mysqltest warnings mysql-test/t/func_str.test: Remove mysqltest warnings mysql-test/t/grant.test: Remove mysqltest warnings mysql-test/t/greedy_optimizer.test: Remove mysqltest warnings mysql-test/t/group_min_max.test: Remove mysqltest warnings mysql-test/t/innodb.test: Remove mysqltest warnings mysql-test/t/join.test: Remove mysqltest warnings mysql-test/t/limit.test: Remove mysqltest warnings mysql-test/t/null.test: Remove mysqltest warnings mysql-test/t/select.test: Remove mysqltest warnings mysql-test/t/sp-prelocking.test: Remove mysqltest warnings mysql-test/t/strict.test: Remove mysqltest warnings mysql-test/t/subselect.test: Remove mysqltest warnings mysql-test/t/type_newdecimal.test: Remove mysqltest warnings mysql-test/t/view_grant.test: Remove mysqltest warnings mysys/default.c: Fixed compiler warning mysys/hash.c: Fixed compiler warning mysys/list.c: Fixed compiler warning mysys/mf_iocache.c: Fixed compiler warning mysys/mf_keycache.c: Fixed compiler warning mysys/mf_keycaches.c: Fixed compiler warning mysys/my_alloc.c: Fixed compiler warning mysys/my_dup.c: Fixed compiler warning mysys/my_fopen.c: Fixed compiler warning mysys/my_fstream.c: Fixed compiler warning mysys/my_getwd.c: Fixed compiler warning mysys/my_handler.c: Fixed compiler warning Added missing enums in switch mysys/my_lib.c: Fixed compiler warning mysys/my_lread.c: Fixed compiler warning mysys/my_lwrite.c: Fixed compiler warning mysys/my_malloc.c: Fixed compiler warning mysys/my_pread.c: Fixed compiler warning mysys/my_read.c: Fixed compiler warning mysys/my_realloc.c: Fixed compiler warning mysys/my_seek.c: Fixed compiler warning mysys/my_write.c: Fixed compiler warning mysys/safemalloc.c: Fixed compiler warning mysys/thr_lock.c: Fixed compiler warning mysys/tree.c: Fixed compiler warning mysys/typelib.c: Fixed compiler warning ndb/include/logger/LogHandler.hpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/include/ndb_global.h.in: Added LINT_SET_PTR macro to be able to remove some compiler warnings ndb/include/util/InputStream.hpp: Fixed compiler warning ndb/include/util/OutputStream.hpp: Fixed compiler warning ndb/include/util/SimpleProperties.hpp: Fixed compiler warning ndb/src/common/debugger/EventLogger.cpp: remove if on 'signal' as this is a function pointer and is always true ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Add missing enums ndb/src/common/logger/LogHandler.cpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/src/common/portlib/NdbMutex.c: Fixed compiler warning ndb/src/common/portlib/NdbThread.c: Fixed compiler warning ndb/src/common/transporter/Transporter.cpp: Swapped arguments to remove compiler warnings ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warning ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warning ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Fixed compiler warning ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Added missing enums ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.hpp: Fixed compiler warning ndb/src/kernel/error/ndbd_exit_codes.c: Fixed compiler warning ndb/src/kernel/vm/TransporterCallback.cpp: Fixed compiler warning ndb/src/mgmapi/mgmapi.cpp: Fixed compiler warning ndb/src/mgmclient/CommandInterpreter.cpp: Fixed compiler warning ndb/src/mgmsrv/MgmtSrvr.cpp: Fixed compiler warning ndb/src/mgmsrv/Services.cpp: Fixed compiler warning ndb/src/ndbapi/ClusterMgr.cpp: Fixed compiler warning ndb/src/ndbapi/DictCache.cpp: Fixed compiler warning ndb/src/ndbapi/Ndb.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationDefine.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationInt.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationSearch.cpp: Fixed compiler warning ndb/src/ndbapi/NdbTransaction.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbif.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbinit.cpp: Fixed compiler warning ndb/src/ndbapi/ndb_cluster_connection.cpp: Fixed compiler warning ndb/tools/drop_index.cpp: Fixed compiler warning ndb/tools/drop_tab.cpp: Fixed compiler warning ndb/tools/ndb_config.cpp: Fixed compiler warning regex/regexec.c: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warning sql/Makefile.am: Fix for bison 1.875, which adds an attribute statement that gcc 4.1.0 can't parse sql/filesort.cc: Fixed compiler warning sql/ha_archive.cc: Fixed compiler warning sql/ha_federated.cc: Fixed compiler warning sql/ha_federated.h: Fixed compiler warning sql/ha_innodb.cc: Fixed compiler warning sql/ha_myisam.cc: Fixed compiler warning sql/ha_myisammrg.cc: Fixed compiler warning sql/ha_ndbcluster.cc: Fixed compiler warning sql/handler.cc: Fixed compiler warning sql/item_cmpfunc.cc: Fixed compiler warning sql/item_subselect.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warning sql/mysqld.cc: Fixed compiler warning sql/net_serv.cc: Fixed compiler warning sql/opt_range.cc: Fixed compiler warning Formated DBUG statements to be as rest of code sql/slave.cc: Fixed compiler warning sql/sql_acl.cc: Fixed compiler warning sql/sql_cache.cc: Fixed compiler warning Fixed bug in query cache when used with DBUG traceing sql/sql_class.cc: Fixed compiler warning sql/sql_class.h: Fixed compiler warning sql/sql_delete.cc: Fixed compiler warning sql/sql_parse.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_prepare.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_repl.cc: Fixed compiler warning sql/sql_select.cc: Fixed compiler warning sql/sql_update.cc: Fixed compiler warning sql/sql_view.cc: Fixed compiler warning sql/strfunc.cc: Fixed compiler warning sql-common/client.c: Fixed compiler warning sql-common/my_time.c: Fixed compiler warning sql/table.cc: Fixed compiler warning sql/tztime.cc: Fixed compiler warning sql/unireg.cc: Fixed compiler warning strings/decimal.c: Fixed compiler warning tests/mysql_client_test.c: Fixed compiler warning vio/viosocket.c: Fixed compiler warning vio/viossl.c: Fixed compiler warning vio/viosslfactories.c: Fixed compiler warning
225 lines
5.7 KiB
C
225 lines
5.7 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include <my_global.h>
|
|
#include <mysql.h>
|
|
#include <mysql_embed.h>
|
|
#include <mysqld_error.h>
|
|
#include <my_pthread.h>
|
|
#include "embedded_priv.h"
|
|
#include <my_sys.h>
|
|
#include <mysys_err.h>
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
#include "errmsg.h"
|
|
#include <violite.h>
|
|
#include <sys/stat.h>
|
|
#include <signal.h>
|
|
#include <time.h>
|
|
#include "client_settings.h"
|
|
#ifdef HAVE_PWD_H
|
|
#include <pwd.h>
|
|
#endif
|
|
#if !defined(MSDOS) && !defined(__WIN__)
|
|
#include <sys/socket.h>
|
|
#include <netinet/in.h>
|
|
#include <arpa/inet.h>
|
|
#include <netdb.h>
|
|
#ifdef HAVE_SELECT_H
|
|
# include <select.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_SELECT_H
|
|
#include <sys/select.h>
|
|
#endif
|
|
#endif
|
|
#ifdef HAVE_SYS_UN_H
|
|
# include <sys/un.h>
|
|
#endif
|
|
#ifndef INADDR_NONE
|
|
#define INADDR_NONE -1
|
|
#endif
|
|
|
|
extern ulong net_buffer_length;
|
|
extern ulong max_allowed_packet;
|
|
|
|
#if defined(MSDOS) || defined(__WIN__)
|
|
#define ERRNO WSAGetLastError()
|
|
#define perror(A)
|
|
#else
|
|
#include <errno.h>
|
|
#define ERRNO errno
|
|
#define SOCKET_ERROR -1
|
|
#define closesocket(A) close(A)
|
|
#endif
|
|
|
|
#ifdef HAVE_GETPWUID
|
|
struct passwd *getpwuid(uid_t);
|
|
char* getlogin(void);
|
|
#endif
|
|
|
|
#ifdef __WIN__
|
|
static my_bool is_NT(void)
|
|
{
|
|
char *os=getenv("OS");
|
|
return (os && !strcmp(os, "Windows_NT")) ? 1 : 0;
|
|
}
|
|
#endif
|
|
|
|
/**************************************************************************
|
|
** Shut down connection
|
|
**************************************************************************/
|
|
|
|
static void end_server(MYSQL *mysql)
|
|
{
|
|
DBUG_ENTER("end_server");
|
|
free_old_query(mysql);
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
|
|
|
|
int mysql_init_character_set(MYSQL *mysql);
|
|
|
|
MYSQL * STDCALL
|
|
mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
|
|
const char *passwd, const char *db,
|
|
uint port, const char *unix_socket,ulong client_flag)
|
|
{
|
|
char name_buff[USERNAME_LENGTH];
|
|
|
|
DBUG_ENTER("mysql_real_connect");
|
|
DBUG_PRINT("enter",("host: %s db: %s user: %s",
|
|
host ? host : "(Null)",
|
|
db ? db : "(Null)",
|
|
user ? user : "(Null)"));
|
|
|
|
if (!host || !host[0])
|
|
host= mysql->options.host;
|
|
|
|
if (mysql->options.methods_to_use == MYSQL_OPT_USE_REMOTE_CONNECTION ||
|
|
(mysql->options.methods_to_use == MYSQL_OPT_GUESS_CONNECTION &&
|
|
host && *host && strcmp(host,LOCAL_HOST)))
|
|
DBUG_RETURN(cli_mysql_real_connect(mysql, host, user,
|
|
passwd, db, port,
|
|
unix_socket, client_flag));
|
|
|
|
mysql->methods= &embedded_methods;
|
|
|
|
/* use default options */
|
|
if (mysql->options.my_cnf_file || mysql->options.my_cnf_group)
|
|
{
|
|
mysql_read_default_options(&mysql->options,
|
|
(mysql->options.my_cnf_file ?
|
|
mysql->options.my_cnf_file : "my"),
|
|
mysql->options.my_cnf_group);
|
|
my_free(mysql->options.my_cnf_file,MYF(MY_ALLOW_ZERO_PTR));
|
|
my_free(mysql->options.my_cnf_group,MYF(MY_ALLOW_ZERO_PTR));
|
|
mysql->options.my_cnf_file=mysql->options.my_cnf_group=0;
|
|
}
|
|
|
|
if (!db || !db[0])
|
|
db=mysql->options.db;
|
|
|
|
if (!user || !user[0])
|
|
user=mysql->options.user;
|
|
|
|
#ifndef NO_EMBEDDED_ACCESS_CHECKS
|
|
if (!passwd)
|
|
{
|
|
passwd=mysql->options.password;
|
|
#if !defined(DONT_USE_MYSQL_PWD)
|
|
if (!passwd)
|
|
passwd=getenv("MYSQL_PWD"); /* get it from environment */
|
|
#endif
|
|
}
|
|
mysql->passwd= passwd ? my_strdup(passwd,MYF(0)) : NULL;
|
|
#endif /*!NO_EMBEDDED_ACCESS_CHECKS*/
|
|
if (!user || !user[0])
|
|
{
|
|
read_user_name(name_buff);
|
|
if (name_buff[0])
|
|
user= name_buff;
|
|
}
|
|
|
|
if (!user)
|
|
user= "";
|
|
/*
|
|
We need to alloc some space for mysql->info but don't want to
|
|
put extra 'my_free's in mysql_close.
|
|
So we alloc it with the 'user' string to be freed at once
|
|
*/
|
|
mysql->user= my_strdup(user, MYF(0));
|
|
|
|
port=0;
|
|
unix_socket=0;
|
|
|
|
/* Send client information for access check */
|
|
client_flag|=CLIENT_CAPABILITIES;
|
|
if (client_flag & CLIENT_MULTI_STATEMENTS)
|
|
client_flag|= CLIENT_MULTI_RESULTS;
|
|
client_flag&= ~CLIENT_COMPRESS;
|
|
if (db)
|
|
client_flag|=CLIENT_CONNECT_WITH_DB;
|
|
|
|
mysql->info_buffer= my_malloc(MYSQL_ERRMSG_SIZE, MYF(0));
|
|
mysql->thd= create_embedded_thd(client_flag);
|
|
|
|
init_embedded_mysql(mysql, client_flag);
|
|
|
|
if (mysql_init_character_set(mysql))
|
|
goto error;
|
|
|
|
if (check_embedded_connection(mysql, db))
|
|
goto error;
|
|
|
|
mysql->server_status= SERVER_STATUS_AUTOCOMMIT;
|
|
|
|
if (mysql->options.init_commands)
|
|
{
|
|
DYNAMIC_ARRAY *init_commands= mysql->options.init_commands;
|
|
char **ptr= (char**)init_commands->buffer;
|
|
char **end= ptr + init_commands->elements;
|
|
|
|
for (; ptr<end; ptr++)
|
|
{
|
|
MYSQL_RES *res;
|
|
if (mysql_query(mysql,*ptr))
|
|
goto error;
|
|
if (mysql->fields)
|
|
{
|
|
if (!(res= (*mysql->methods->use_result)(mysql)))
|
|
goto error;
|
|
mysql_free_result(res);
|
|
}
|
|
}
|
|
}
|
|
|
|
DBUG_PRINT("exit",("Mysql handler: 0x%lx", (long) mysql));
|
|
DBUG_RETURN(mysql);
|
|
|
|
error:
|
|
DBUG_PRINT("error",("message: %u (%s)", mysql->net.last_errno,
|
|
mysql->net.last_error));
|
|
{
|
|
/* Free alloced memory */
|
|
my_bool free_me=mysql->free_me;
|
|
end_server(mysql);
|
|
mysql->free_me=0;
|
|
mysql_close(mysql);
|
|
mysql->free_me=free_me;
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|