database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Move latin1 into a separarte file

Browse Source
This commit is contained in:
unknown
2003-01-29 17:31:20 +04:00
parent 6a188877d4
commit 307ed01440
36 changed files with 445 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/mysqld.cc
View File

@ -33,7 +33,7 @@
#include <thr_alarm.h>
#include <ft_global.h>
#define mysqld_charset my_charset_latin1
#define mysqld_charset &my_charset_latin1
#ifndef DBUG_OFF
#define ONE_THREAD
@ -1937,7 +1937,7 @@ static int init_common_variables(const char *conf_file_name, int argc,
set_var_init();
mysys_uses_curses=0;
#ifdef USE_REGEX
regex_init(my_charset_latin1);
regex_init(&my_charset_latin1);
#endif
if (set_default_charset_by_name(sys_charset.value, MYF(MY_WME)))
return 1;
@ -4736,8 +4736,8 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
int err;
char *end;
uint length= strlen(argument);
long value= my_strntol(my_charset_latin1, argument, length, 10, &end, &err);
if (test_if_int(argument,(uint) length, end, my_charset_latin1))
long value= my_strntol(&my_charset_latin1, argument, length, 10, &end, &err);
if (test_if_int(argument,(uint) length, end, &my_charset_latin1))
berkeley_lock_scan_time= value;
else
{