mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
9421f1dae9
Some simple optimzations, more comments and indentation changes. Add ` around database in 'use database' in binary log. Moved max_error_count and max_warning_count to variables struct. Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls. Changed string functions to use character set of first string argument as default return characterset (Each string function can change the above assumption if needed) BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395: Auto merged BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31: Auto merged Docs/manual.texi: Auto merged SSL/cacert.pem: Auto merged SSL/client-cert.pem: Auto merged SSL/client-key.pem: Auto merged SSL/server-cert.pem: Auto merged SSL/server-key.pem: Auto merged client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_sys.h: Auto merged include/mysql_com.h: Auto merged isam/isamlog.c: Auto merged isam/pack_isam.c: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/ft_dump.c: Auto merged myisam/ft_parser.c: Auto merged myisam/ft_static.c: Auto merged myisam/ft_test1.c: Auto merged myisam/ft_update.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_key.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_static.c: Auto merged myisam/mi_test1.c: Auto merged myisam/mi_test2.c: Auto merged myisam/mi_test3.c: Auto merged myisam/mi_update.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamdef.h: Auto merged myisam/myisamlog.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/func_math.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/select_found.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/select_found.test: Auto merged mysql-test/t/union.test: Auto merged mysys/default.c: Auto merged mysys/mf_iocache2.c: Auto merged mysys/my_error.c: Auto merged mysys/my_init.c: Auto merged scripts/mysql_config.sh: Auto merged sql/convert.cc: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/item.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/key.cc: Auto merged sql/log.cc: Auto merged sql/net_pkg.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/time.cc: Auto merged sql/unireg.cc: Auto merged strings/Makefile.am: Auto merged strings/ctype-latin1_de.c: Auto merged strings/ctype-tis620.c: Auto merged tools/mysqlmanager.c: Auto merged BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997: merge with 4.0.3 BitKeeper/triggers/post-commit: merge with 4.0.3 client/mysql.cc: merge with 4.0.3 + simple optimsation client/mysqltest.c: merge with 4.0.3 (Indentation change) configure.in: merge with 4.0.3 extra/resolve_stack_dump.c: merge with 4.0.3 (Indentation change) include/Makefile.am: merge with 4.0.3 include/myisam.h: merge with 4.0.3 (Indentation change) include/mysql.h: merge with 4.0.3 (removed not used structure) include/mysqld_error.h: merge with 4.0.3 libmysql/Makefile.shared: merge with 4.0.3 libmysql/libmysql.c: merge with 4.0.3 (Indentation change) libmysqld/Makefile.am: merge with 4.0.3 myisam/ft_boolean_search.c: merge with 4.0.3 (Indentation change) myisam/ft_nlq_search.c: merge with 4.0.3 (Indentation change) myisam/mi_check.c: merge with 4.0.3 myisam/mi_search.c: merge with 4.0.3 myisam/mi_unique.c: merge with 4.0.3 mysys/Makefile.am: merge with 4.0.3 mysys/mf_casecnv.c: merge with 4.0.3 sql-bench/server-cfg.sh: Removed 8000 max row limit for Innodb sql/Makefile.am: merge with 4.0.3 sql/field.cc: Indentation cleanup Changed sprintf -> my_sprintf sql/field.h: merge with 4.0.3 sql/ha_heap.cc: merge with 4.0.3 (Indentation change) sql/item.h: merge with 4.0.3 (Indentation change) sql/item_cmpfunc.cc: merge with 4.0.3 sql/item_cmpfunc.h: Removed size_of() from items Indentation cleanup sql/item_create.cc: merge sql/item_create.h: merge sql/item_func.cc: Added comments Changed string functions to use character set of first string argument as default return characterset Simple optimizations. Removed return of uninitalized variable. sql/item_func.h: merge sql/item_strfunc.cc: merge with 4.0.3 (Indentation change) sql/item_strfunc.h: removed size_of() sql/item_uniq.h: removed size_of() sql/lex.h: merge with 4.0.3 (Indentation change) sql/log_event.cc: Add ` around database in 'use database' in binary log. sql/mysql_priv.h: merge with 4.0.3 sql/mysqld.cc: merge with 4.0.3 (Indentation change) sql/share/czech/errmsg.txt: merge sql/share/danish/errmsg.txt: merge sql/share/dutch/errmsg.txt: merge sql/share/english/errmsg.txt: merge sql/share/estonian/errmsg.txt: merge sql/share/french/errmsg.txt: merge sql/share/german/errmsg.txt: merge sql/share/greek/errmsg.txt: merge sql/share/hungarian/errmsg.txt: merge sql/share/italian/errmsg.txt: merge sql/share/japanese/errmsg.txt: merge sql/share/korean/errmsg.txt: merge sql/share/norwegian-ny/errmsg.txt: merge sql/share/norwegian/errmsg.txt: merge sql/share/polish/errmsg.txt: merge sql/share/portuguese/errmsg.txt: merge sql/share/romanian/errmsg.txt: merge sql/share/russian/errmsg.txt: merge sql/share/slovak/errmsg.txt: merge sql/share/spanish/errmsg.txt: merge sql/share/swedish/errmsg.txt: merge sql/share/ukrainian/errmsg.txt: merge sql/sql_acl.cc: merge with 4.0.3 sql/sql_base.cc: More comments Fixed bug in send_fields() when using convert sql/sql_class.cc: merge sql/sql_class.h: Merge with 4.0.3 Moved max_error_count and max_warning_count to variables struct. sql/sql_delete.cc: merge with 4.0.3 (Indentation change) sql/sql_lex.h: merge with 4.0.3 sql/sql_parse.cc: Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT. (Should be retrived from variables) sql/sql_select.cc: merge with 4.0.3 sql/sql_show.cc: merge with 4.0.3 sql/sql_union.cc: merge with 4.0.3 sql/sql_update.cc: merge with 4.0.3 sql/sql_yacc.yy: merge with 4.0.3 Indentation cleanup sql/structs.h: merge with 4.0.3 sql/table.cc: merge with 4.0.3 sql/table.h: merge with 4.0.3
321 lines
9.2 KiB
C
321 lines
9.2 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 "mysys_priv.h"
|
|
#include "my_static.h"
|
|
#include "mysys_err.h"
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
#ifdef HAVE_GETRUSAGE
|
|
#include <sys/resource.h>
|
|
/* extern int getrusage(int, struct rusage *); */
|
|
#endif
|
|
#include <signal.h>
|
|
#ifdef VMS
|
|
#include <my_static.c>
|
|
#include <m_ctype.h>
|
|
#endif
|
|
#ifdef __WIN__
|
|
#ifdef _MSC_VER
|
|
#include <locale.h>
|
|
#include <crtdbg.h>
|
|
#endif
|
|
my_bool have_tcpip=0;
|
|
static void my_win_init(void);
|
|
static my_bool win32_have_tcpip(void);
|
|
static my_bool win32_init_tcp_ip();
|
|
#else
|
|
#define my_win_init()
|
|
#endif
|
|
|
|
my_bool my_init_done=0;
|
|
|
|
static ulong atoi_octal(const char *str)
|
|
{
|
|
long int tmp;
|
|
while (*str && my_isspace(system_charset_info, *str))
|
|
str++;
|
|
str2int(str,
|
|
(*str == '0' ? 8 : 10), /* Octalt or decimalt */
|
|
0, INT_MAX, &tmp);
|
|
return (ulong) tmp;
|
|
}
|
|
|
|
|
|
/* Init my_sys functions and my_sys variabels */
|
|
|
|
void my_init(void)
|
|
{
|
|
my_string str;
|
|
if (my_init_done)
|
|
return;
|
|
my_init_done=1;
|
|
#ifdef THREAD
|
|
#if defined(HAVE_PTHREAD_INIT)
|
|
pthread_init(); /* Must be called before DBUG_ENTER */
|
|
#endif
|
|
my_thread_global_init();
|
|
#if !defined( __WIN__) && !defined(OS2)
|
|
sigfillset(&my_signals); /* signals blocked by mf_brkhant */
|
|
#endif
|
|
#endif /* THREAD */
|
|
#ifdef UNIXWARE_7
|
|
(void) isatty(0); /* Go around connect() bug in UW7 */
|
|
#endif
|
|
{
|
|
DBUG_ENTER("my_init");
|
|
DBUG_PROCESS(my_progname ? my_progname : (char*) "unknown");
|
|
if (!home_dir)
|
|
{ /* Don't initialize twice */
|
|
my_win_init();
|
|
if ((home_dir=getenv("HOME")) != 0)
|
|
home_dir=intern_filename(home_dir_buff,home_dir);
|
|
#ifndef VMS
|
|
/* Default creation of new files */
|
|
if ((str=getenv("UMASK")) != 0)
|
|
my_umask=(int) (atoi_octal(str) | 0600);
|
|
/* Default creation of new dir's */
|
|
if ((str=getenv("UMASK_DIR")) != 0)
|
|
my_umask_dir=(int) (atoi_octal(str) | 0700);
|
|
#endif
|
|
#ifdef VMS
|
|
init_ctype(); /* Stupid linker don't link _ctype.c */
|
|
#endif
|
|
DBUG_PRINT("exit",("home: '%s'",home_dir));
|
|
}
|
|
#ifdef __WIN__
|
|
win32_init_tcp_ip();
|
|
#endif
|
|
DBUG_VOID_RETURN;
|
|
}
|
|
} /* my_init */
|
|
|
|
|
|
/* End my_sys */
|
|
|
|
void my_end(int infoflag)
|
|
{
|
|
FILE *info_file;
|
|
if (!(info_file=DBUG_FILE))
|
|
info_file=stderr;
|
|
if (infoflag & MY_CHECK_ERROR || info_file != stderr)
|
|
{ /* Test if some file is left open */
|
|
if (my_file_opened | my_stream_opened)
|
|
{
|
|
sprintf(errbuff[0],EE(EE_OPEN_WARNING),my_file_opened,my_stream_opened);
|
|
(void) my_message_no_curses(EE_OPEN_WARNING,errbuff[0],ME_BELL);
|
|
DBUG_PRINT("error",("%s",errbuff[0]));
|
|
}
|
|
}
|
|
free_charsets();
|
|
if (infoflag & MY_GIVE_INFO || info_file != stderr)
|
|
{
|
|
#ifdef HAVE_GETRUSAGE
|
|
struct rusage rus;
|
|
if (!getrusage(RUSAGE_SELF, &rus))
|
|
fprintf(info_file,"\n\
|
|
User time %.2f, System time %.2f\n\
|
|
Maximum resident set size %ld, Integral resident set size %ld\n\
|
|
Non-physical pagefaults %ld, Physical pagefaults %ld, Swaps %ld\n\
|
|
Blocks in %ld out %ld, Messages in %ld out %ld, Signals %ld\n\
|
|
Voluntary context switches %ld, Involuntary context switches %ld\n",
|
|
(rus.ru_utime.tv_sec * SCALE_SEC +
|
|
rus.ru_utime.tv_usec / SCALE_USEC) / 100.0,
|
|
(rus.ru_stime.tv_sec * SCALE_SEC +
|
|
rus.ru_stime.tv_usec / SCALE_USEC) / 100.0,
|
|
rus.ru_maxrss, rus.ru_idrss,
|
|
rus.ru_minflt, rus.ru_majflt,
|
|
rus.ru_nswap, rus.ru_inblock, rus.ru_oublock,
|
|
rus.ru_msgsnd, rus.ru_msgrcv, rus.ru_nsignals,
|
|
rus.ru_nvcsw, rus.ru_nivcsw);
|
|
#endif
|
|
#if defined(MSDOS) && !defined(__WIN__)
|
|
fprintf(info_file,"\nRun time: %.1f\n",(double) clock()/CLOCKS_PER_SEC);
|
|
#endif
|
|
#if defined(SAFEMALLOC)
|
|
TERMINATE(stderr); /* Give statistic on screen */
|
|
#elif defined(__WIN__) && defined(_MSC_VER)
|
|
_CrtSetReportMode( _CRT_WARN, _CRTDBG_MODE_FILE );
|
|
_CrtSetReportFile( _CRT_WARN, _CRTDBG_FILE_STDERR );
|
|
_CrtSetReportMode( _CRT_ERROR, _CRTDBG_MODE_FILE );
|
|
_CrtSetReportFile( _CRT_ERROR, _CRTDBG_FILE_STDERR );
|
|
_CrtSetReportMode( _CRT_ASSERT, _CRTDBG_MODE_FILE );
|
|
_CrtSetReportFile( _CRT_ASSERT, _CRTDBG_FILE_STDERR );
|
|
_CrtCheckMemory();
|
|
_CrtDumpMemoryLeaks();
|
|
#endif
|
|
}
|
|
#ifdef THREAD
|
|
pthread_mutex_destroy(&THR_LOCK_keycache);
|
|
pthread_mutex_destroy(&THR_LOCK_malloc);
|
|
pthread_mutex_destroy(&THR_LOCK_open);
|
|
DBUG_POP(); /* Must be done before my_thread_end */
|
|
my_once_free();
|
|
my_thread_end();
|
|
my_thread_global_end();
|
|
#endif
|
|
#ifdef __WIN__
|
|
if (have_tcpip);
|
|
WSACleanup( );
|
|
#endif /* __WIN__ */
|
|
my_init_done=0;
|
|
} /* my_end */
|
|
|
|
#ifdef __WIN__
|
|
|
|
/*
|
|
This code is specially for running MySQL, but it should work in
|
|
other cases too.
|
|
|
|
Inizializzazione delle variabili d'ambiente per Win a 32 bit.
|
|
|
|
Vengono inserite nelle variabili d'ambiente (utilizzando cosi'
|
|
le funzioni getenv e putenv) i valori presenti nelle chiavi
|
|
del file di registro:
|
|
|
|
HKEY_LOCAL_MACHINE\software\MySQL
|
|
|
|
Se la kiave non esiste nonn inserisce nessun valore
|
|
*/
|
|
|
|
/* Crea la stringa d'ambiente */
|
|
|
|
void setEnvString(char *ret, const char *name, const char *value)
|
|
{
|
|
DBUG_ENTER("setEnvString");
|
|
strxmov(ret, name,"=",value,NullS);
|
|
DBUG_VOID_RETURN ;
|
|
}
|
|
|
|
static void my_win_init(void)
|
|
{
|
|
HKEY hSoftMysql ;
|
|
DWORD dimName = 256 ;
|
|
DWORD dimData = 1024 ;
|
|
DWORD dimNameValueBuffer = 256 ;
|
|
DWORD dimDataValueBuffer = 1024 ;
|
|
DWORD indexValue = 0 ;
|
|
long retCodeEnumValue ;
|
|
char NameValueBuffer[256] ;
|
|
char DataValueBuffer[1024] ;
|
|
char EnvString[1271] ;
|
|
const char *targetKey = "Software\\MySQL" ;
|
|
DBUG_ENTER("my_win_init");
|
|
|
|
setlocale(LC_CTYPE, ""); /* To get right sortorder */
|
|
|
|
/* apre la chiave HKEY_LOCAL_MACHINES\software\MySQL */
|
|
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE,(LPCTSTR)targetKey,0,
|
|
KEY_READ,&hSoftMysql) != ERROR_SUCCESS)
|
|
DBUG_VOID_RETURN;
|
|
|
|
/*
|
|
** Ne legge i valori e li inserisce nell'ambiente
|
|
** suppone che tutti i valori letti siano di tipo stringa + '\0'
|
|
** Legge il valore con indice 0 e lo scarta
|
|
*/
|
|
retCodeEnumValue = RegEnumValue(hSoftMysql, indexValue++,
|
|
(LPTSTR)NameValueBuffer, &dimNameValueBuffer,
|
|
NULL, NULL, (LPBYTE)DataValueBuffer,
|
|
&dimDataValueBuffer) ;
|
|
|
|
while (retCodeEnumValue != ERROR_NO_MORE_ITEMS)
|
|
{
|
|
char *my_env;
|
|
/* Crea la stringa d'ambiente */
|
|
setEnvString(EnvString, NameValueBuffer, DataValueBuffer) ;
|
|
|
|
/* Inserisce i dati come variabili d'ambiente */
|
|
my_env=strdup(EnvString); /* variable for putenv must be allocated ! */
|
|
putenv(EnvString) ;
|
|
|
|
dimNameValueBuffer = dimName ;
|
|
dimDataValueBuffer = dimData ;
|
|
|
|
retCodeEnumValue = RegEnumValue(hSoftMysql, indexValue++,
|
|
NameValueBuffer, &dimNameValueBuffer,
|
|
NULL, NULL, (LPBYTE)DataValueBuffer,
|
|
&dimDataValueBuffer) ;
|
|
}
|
|
|
|
/* chiude la chiave */
|
|
RegCloseKey(hSoftMysql) ;
|
|
DBUG_VOID_RETURN ;
|
|
}
|
|
|
|
|
|
/*------------------------------------------------------------------
|
|
** Name: CheckForTcpip| Desc: checks if tcpip has been installed on system
|
|
** According to Microsoft Developers documentation the first registry
|
|
** entry should be enough to check if TCP/IP is installed, but as expected
|
|
** this doesn't work on all Win32 machines :(
|
|
------------------------------------------------------------------*/
|
|
|
|
#define TCPIPKEY "SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters"
|
|
#define WINSOCK2KEY "SYSTEM\\CurrentControlSet\\Services\\Winsock2\\Parameters"
|
|
#define WINSOCKKEY "SYSTEM\\CurrentControlSet\\Services\\Winsock\\Parameters"
|
|
|
|
static my_bool win32_have_tcpip(void)
|
|
{
|
|
HKEY hTcpipRegKey;
|
|
if (RegOpenKeyEx ( HKEY_LOCAL_MACHINE, TCPIPKEY, 0, KEY_READ,
|
|
&hTcpipRegKey) != ERROR_SUCCESS)
|
|
{
|
|
if (RegOpenKeyEx ( HKEY_LOCAL_MACHINE, WINSOCK2KEY, 0, KEY_READ,
|
|
&hTcpipRegKey) != ERROR_SUCCESS)
|
|
{
|
|
if (RegOpenKeyEx ( HKEY_LOCAL_MACHINE, WINSOCKKEY, 0, KEY_READ,
|
|
&hTcpipRegKey) != ERROR_SUCCESS)
|
|
if (!getenv("HAVE_TCPIP") || have_tcpip) /* Provide a workaround */
|
|
return (FALSE);
|
|
}
|
|
}
|
|
RegCloseKey ( hTcpipRegKey);
|
|
return (TRUE);
|
|
}
|
|
|
|
static my_bool win32_init_tcp_ip()
|
|
{
|
|
if (win32_have_tcpip())
|
|
{
|
|
WORD wVersionRequested = MAKEWORD( 2, 0 );
|
|
WSADATA wsaData;
|
|
/* Be a good citizen: maybe another lib has already initialised
|
|
sockets, so dont clobber them unless necessary */
|
|
if (WSAStartup( wVersionRequested, &wsaData ))
|
|
{
|
|
/* Load failed, maybe because of previously loaded
|
|
incompatible version; try again */
|
|
WSACleanup( );
|
|
if (!WSAStartup( wVersionRequested, &wsaData ))
|
|
have_tcpip=1;
|
|
}
|
|
else
|
|
{
|
|
if (wsaData.wVersion != wVersionRequested)
|
|
{
|
|
/* Version is no good, try again */
|
|
WSACleanup( );
|
|
if (!WSAStartup( wVersionRequested, &wsaData ))
|
|
have_tcpip=1;
|
|
}
|
|
else
|
|
have_tcpip=1;
|
|
}
|
|
}
|
|
return(0);
|
|
}
|
|
#endif
|