Skip to content

M
MariaDB
Commit 6bc2acce authored by unknown's avatar unknown
Browse files
Options

Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/mysqld.cc:
  Auto merged
parents 5bafde9a 79821874
Show whitespace changes
Inline Side-by-side
Showing with 282 additions and 238 deletions
myisam/ftdefs.h
View file @ 6bc2acce
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#define misc_word_char(X) ((X)=='\'') #define misc_word_char(X) ((X)=='\'')
#define word_char(s,X) (true_word_char(s,X) || misc_word_char(X)) #define word_char(s,X) (true_word_char(s,X) || misc_word_char(X))
#define FT_MAX_WORD_LEN_FOR_SORT 20 #define FT_MAX_WORD_LEN_FOR_SORT 31
#define COMPILE_STOPWORDS_IN #define COMPILE_STOPWORDS_IN
......
myisam/mi_check.c
View file @ 6bc2acce
...@@ -2020,12 +2020,14 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, ...@@ -2020,12 +2020,14 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info,
if (sort_param.keyinfo->flag & HA_FULLTEXT) if (sort_param.keyinfo->flag & HA_FULLTEXT)
{ {
uint ft_max_word_len_for_sort=FT_MAX_WORD_LEN_FOR_SORT*
sort_param.keyinfo->seg->charset->mbmaxlen;
sort_info.max_records= sort_info.max_records=
(ha_rows) (sort_info.filelength/FT_MAX_WORD_LEN_FOR_SORT+1); (ha_rows) (sort_info.filelength/ft_max_word_len_for_sort+1);
sort_param.key_read=sort_ft_key_read; sort_param.key_read=sort_ft_key_read;
sort_param.key_write=sort_ft_key_write; sort_param.key_write=sort_ft_key_write;
sort_param.key_length+=FT_MAX_WORD_LEN_FOR_SORT-HA_FT_MAXBYTELEN; sort_param.key_length+=ft_max_word_len_for_sort-HA_FT_MAXBYTELEN;
} }
else else
{ {
...@@ -2425,7 +2427,11 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info, ...@@ -2425,7 +2427,11 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info,
total_key_length+=sort_param[i].key_length; total_key_length+=sort_param[i].key_length;
if (sort_param[i].keyinfo->flag & HA_FULLTEXT) if (sort_param[i].keyinfo->flag & HA_FULLTEXT)
sort_param[i].key_length+=FT_MAX_WORD_LEN_FOR_SORT-HA_FT_MAXBYTELEN; {
uint ft_max_word_len_for_sort=FT_MAX_WORD_LEN_FOR_SORT*
sort_param[i].keyinfo->seg->charset->mbmaxlen;
sort_param[i].key_length+=ft_max_word_len_for_sort-HA_FT_MAXBYTELEN;
}
} }
sort_info.total_keys=i; sort_info.total_keys=i;
sort_param[0].master= 1; sort_param[0].master= 1;
...@@ -2634,7 +2640,6 @@ static int sort_key_read(MI_SORT_PARAM *sort_param, void *key) ...@@ -2634,7 +2640,6 @@ static int sort_key_read(MI_SORT_PARAM *sort_param, void *key)
DBUG_RETURN(sort_write_record(sort_param)); DBUG_RETURN(sort_write_record(sort_param));
} /* sort_key_read */ } /* sort_key_read */
static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key) static int sort_ft_key_read(MI_SORT_PARAM *sort_param, void *key)
{ {
int error; int error;
...@@ -3950,25 +3955,28 @@ static ha_checksum mi_byte_checksum(const byte *buf, uint length) ...@@ -3950,25 +3955,28 @@ static ha_checksum mi_byte_checksum(const byte *buf, uint length)
return crc; return crc;
} }
/*
Deactive all not unique index that can be recreated fast
These include packed keys on which sorting will use more temporary
space than the max allowed file length or for which the unpacked keys
will take much more space than packed keys.
Note that 'rows' may be zero for the case when we don't know how many
rows we will put into the file.
*/
static my_bool mi_too_big_key_for_sort(MI_KEYDEF *key, ha_rows rows) static my_bool mi_too_big_key_for_sort(MI_KEYDEF *key, ha_rows rows)
{ {
uint key_maxlength=key->maxlength; uint key_maxlength=key->maxlength;
if (key->flag & HA_FULLTEXT) if (key->flag & HA_FULLTEXT)
key_maxlength+=FT_MAX_WORD_LEN_FOR_SORT-HA_FT_MAXBYTELEN; {
uint ft_max_word_len_for_sort=FT_MAX_WORD_LEN_FOR_SORT*
key->seg->charset->mbmaxlen;
key_maxlength+=ft_max_word_len_for_sort-HA_FT_MAXBYTELEN;
}
return (key->flag & (HA_BINARY_PACK_KEY | HA_VAR_LENGTH_KEY | HA_FULLTEXT) && return (key->flag & (HA_BINARY_PACK_KEY | HA_VAR_LENGTH_KEY | HA_FULLTEXT) &&
((ulonglong) rows * key_maxlength > ((ulonglong) rows * key_maxlength >
(ulonglong) myisam_max_temp_length)); (ulonglong) myisam_max_temp_length));
} }
/*
Deactivate all not unique index that can be recreated fast
These include packed keys on which sorting will use more temporary
space than the max allowed file length or for which the unpacked keys
will take much more space than packed keys.
Note that 'rows' may be zero for the case when we don't know how many
rows we will put into the file.
*/
void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows) void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows)
{ {
......
myisam/mi_search.c
View file @ 6bc2acce
...@@ -451,9 +451,8 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page, ...@@ -451,9 +451,8 @@ int _mi_prefix_search(MI_INFO *info, register MI_KEYDEF *keyinfo, uchar *page,
/* We have to compare k and vseg as if they where space extended */ /* We have to compare k and vseg as if they where space extended */
for (end=vseg + (len-cmplen) ; for (end=vseg + (len-cmplen) ;
vseg < end && *vseg == (uchar) ' '; vseg < end && *vseg == (uchar) ' ';
vseg++) ; vseg++, matched++) ;
if (vseg == end) DBUG_ASSERT(vseg < end);
goto cmp_rest; /* should never happen */
if (*vseg > (uchar) ' ') if (*vseg > (uchar) ' ')
{ {
......
myisam/myisamchk.c
View file @ 6bc2acce
...@@ -154,7 +154,7 @@ enum options_mc { ...@@ -154,7 +154,7 @@ enum options_mc {
OPT_KEY_CACHE_BLOCK_SIZE, OPT_MYISAM_BLOCK_SIZE, OPT_KEY_CACHE_BLOCK_SIZE, OPT_MYISAM_BLOCK_SIZE,
OPT_READ_BUFFER_SIZE, OPT_WRITE_BUFFER_SIZE, OPT_SORT_BUFFER_SIZE, OPT_READ_BUFFER_SIZE, OPT_WRITE_BUFFER_SIZE, OPT_SORT_BUFFER_SIZE,
OPT_SORT_KEY_BLOCKS, OPT_DECODE_BITS, OPT_FT_MIN_WORD_LEN, OPT_SORT_KEY_BLOCKS, OPT_DECODE_BITS, OPT_FT_MIN_WORD_LEN,
OPT_FT_MAX_WORD_LEN, OPT_FT_MAX_WORD_LEN_FOR_SORT, OPT_FT_STOPWORD_FILE, OPT_FT_MAX_WORD_LEN, OPT_FT_STOPWORD_FILE,
OPT_MAX_RECORD_LENGTH OPT_MAX_RECORD_LENGTH
}; };
......
myisam/sort.c
View file @ 6bc2acce
...@@ -204,7 +204,7 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, ...@@ -204,7 +204,7 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
reinit_io_cache(&tempfile,READ_CACHE,0L,0,0)) reinit_io_cache(&tempfile,READ_CACHE,0L,0,0))
goto err; /* purecov: inspected */ goto err; /* purecov: inspected */
if (!no_messages) if (!no_messages)
puts(" - Last merge and dumping keys\n"); /* purecov: tested */ printf(" - Last merge and dumping keys\n"); /* purecov: tested */
if (merge_index(info,keys,sort_keys,dynamic_element(&buffpek,0,BUFFPEK *), if (merge_index(info,keys,sort_keys,dynamic_element(&buffpek,0,BUFFPEK *),
maxbuffer,&tempfile)) maxbuffer,&tempfile))
goto err; /* purecov: inspected */ goto err; /* purecov: inspected */
...@@ -219,6 +219,8 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, ...@@ -219,6 +219,8 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
uint keyno=info->key; uint keyno=info->key;
uint key_length, ref_length=index->s->rec_reflength; uint key_length, ref_length=index->s->rec_reflength;
if (!no_messages)
printf(" - Adding exceptions\n"); /* purecov: tested */
if (flush_io_cache(&tempfile_for_exceptions) || if (flush_io_cache(&tempfile_for_exceptions) ||
reinit_io_cache(&tempfile_for_exceptions,READ_CACHE,0L,0,0)) reinit_io_cache(&tempfile_for_exceptions,READ_CACHE,0L,0,0))
goto err; goto err;
......
mysql-test/r/myisam.result
View file @ 6bc2acce
...@@ -428,6 +428,22 @@ select * from t1 where a='807780' and b='477' and c='165'; ...@@ -428,6 +428,22 @@ select * from t1 where a='807780' and b='477' and c='165';
a b c a b c
807780 477 165 807780 477 165
drop table t1; drop table t1;
DROP TABLE IF EXISTS t1;
Warnings:
Note 1051 Unknown table 't1'
CREATE TABLE t1 (a varchar(150) NOT NULL, KEY (a));
INSERT t1 VALUES ("can \tcan");
INSERT t1 VALUES ("can can");
INSERT t1 VALUES ("can");
SELECT * FROM t1;
a
can can
can
can can
CHECK TABLE t1;
Table Op Msg_type Msg_text
test.t1 check status OK
DROP TABLE t1;
create table t1 (a blob); create table t1 (a blob);
insert into t1 values('a '),('a'); insert into t1 values('a '),('a');
select concat(a,'.') from t1 where a='a'; select concat(a,'.') from t1 where a='a';
......
mysql-test/t/myisam.test
View file @ 6bc2acce
...@@ -422,6 +422,18 @@ insert into t1 values('807780', '472', '162'); ...@@ -422,6 +422,18 @@ insert into t1 values('807780', '472', '162');
select * from t1 where a='807780' and b='477' and c='165'; select * from t1 where a='807780' and b='477' and c='165';
drop table t1; drop table t1;
#
# space-stripping in _mi_prefix_search: BUG#5284
#
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (a varchar(150) NOT NULL, KEY (a));
INSERT t1 VALUES ("can \tcan");
INSERT t1 VALUES ("can can");
INSERT t1 VALUES ("can");
SELECT * FROM t1;
CHECK TABLE t1;
DROP TABLE t1;
# #
# Verify blob handling # Verify blob handling
# #
......
sql/mysql_priv.h
View file @ 6bc2acce
...@@ -783,10 +783,10 @@ int key_cmp(KEY_PART_INFO *key_part, const byte *key, uint key_length); ...@@ -783,10 +783,10 @@ int key_cmp(KEY_PART_INFO *key_part, const byte *key, uint key_length);
bool init_errmessage(void); bool init_errmessage(void);
void sql_perror(const char *message); void sql_perror(const char *message);
void vprint_msg_to_log( enum loglevel level, const char *format, va_list args ); void vprint_msg_to_log(enum loglevel level, const char *format, va_list args);
void sql_print_error( const char *format, ... ); void sql_print_error(const char *format, ...);
void sql_print_warning( const char *format, ...); void sql_print_warning(const char *format, ...);
void sql_print_information( const char *format, ...); void sql_print_information(const char *format, ...);
......
sql/mysqld.cc
View file @ 6bc2acce
...@@ -762,7 +762,7 @@ void kill_mysql(void) ...@@ -762,7 +762,7 @@ void kill_mysql(void)
abort_loop=1; abort_loop=1;
if (pthread_create(&tmp,&connection_attrib, kill_server_thread, if (pthread_create(&tmp,&connection_attrib, kill_server_thread,
(void*) 0)) (void*) 0))
sql_print_error("Error: Can't create thread to kill server"); sql_print_error("Can't create thread to kill server");
} }
#endif #endif
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
...@@ -791,7 +791,7 @@ static void __cdecl kill_server(int sig_ptr) ...@@ -791,7 +791,7 @@ static void __cdecl kill_server(int sig_ptr)
abort_loop=1; // This should be set abort_loop=1; // This should be set
signal(sig,SIG_IGN); signal(sig,SIG_IGN);
if (sig == MYSQL_KILL_SIGNAL || sig == 0) if (sig == MYSQL_KILL_SIGNAL || sig == 0)
sql_print_error(ER(ER_NORMAL_SHUTDOWN),my_progname); sql_print_information(ER(ER_NORMAL_SHUTDOWN),my_progname);
else else
sql_print_error(ER(ER_GOT_SIGNAL),my_progname,sig); /* purecov: inspected */ sql_print_error(ER(ER_GOT_SIGNAL),my_progname,sig); /* purecov: inspected */
...@@ -834,7 +834,7 @@ extern "C" sig_handler print_signal_warning(int sig) ...@@ -834,7 +834,7 @@ extern "C" sig_handler print_signal_warning(int sig)
if (!DBUG_IN_USE) if (!DBUG_IN_USE)
{ {
if (global_system_variables.log_warnings) if (global_system_variables.log_warnings)
sql_print_error("Warning: Got signal %d from thread %d", sql_print_warning("Got signal %d from thread %d",
sig,my_thread_id()); sig,my_thread_id());
} }
#ifdef DONT_REMEMBER_SIGNAL #ifdef DONT_REMEMBER_SIGNAL
...@@ -961,7 +961,7 @@ void clean_up(bool print_message) ...@@ -961,7 +961,7 @@ void clean_up(bool print_message)
#endif #endif
if (print_message && errmesg) if (print_message && errmesg)
sql_print_error(ER(ER_SHUTDOWN_COMPLETE),my_progname); sql_print_information(ER(ER_SHUTDOWN_COMPLETE),my_progname);
#if !defined(__WIN__) && !defined(EMBEDDED_LIBRARY) #if !defined(__WIN__) && !defined(EMBEDDED_LIBRARY)
if (!opt_bootstrap) if (!opt_bootstrap)
(void) my_delete(pidfile_name,MYF(0)); // This may not always exist (void) my_delete(pidfile_name,MYF(0)); // This may not always exist
...@@ -1062,8 +1062,8 @@ static void set_user(const char *user) ...@@ -1062,8 +1062,8 @@ static void set_user(const char *user)
struct passwd *user_info= getpwnam(user); struct passwd *user_info= getpwnam(user);
if ((!user_info || user_id != user_info->pw_uid) && if ((!user_info || user_id != user_info->pw_uid) &&
global_system_variables.log_warnings) global_system_variables.log_warnings)
fprintf(stderr, sql_print_warning(
"Warning: One can only use the --user switch if running as root\n"); "One can only use the --user switch if running as root\n");
} }
return; return;
} }
...@@ -1183,7 +1183,7 @@ static void server_init(void) ...@@ -1183,7 +1183,7 @@ static void server_init(void)
if (listen(ip_sock,(int) back_log) < 0) if (listen(ip_sock,(int) back_log) < 0)
{ {
sql_perror("Can't start server: listen() on TCP/IP port"); sql_perror("Can't start server: listen() on TCP/IP port");
sql_print_error("Error: listen() on TCP/IP failed with error %d", sql_print_error("listen() on TCP/IP failed with error %d",
socket_errno); socket_errno);
unireg_abort(1); unireg_abort(1);
} }
...@@ -1278,7 +1278,7 @@ static void server_init(void) ...@@ -1278,7 +1278,7 @@ static void server_init(void)
(void) chmod(mysqld_unix_port,S_IFSOCK); /* Fix solaris 2.6 bug */ (void) chmod(mysqld_unix_port,S_IFSOCK); /* Fix solaris 2.6 bug */
#endif #endif
if (listen(unix_sock,(int) back_log) < 0) if (listen(unix_sock,(int) back_log) < 0)
sql_print_error("Warning: listen() on Unix socket failed with error %d", sql_print_warning("listen() on Unix socket failed with error %d",
socket_errno); socket_errno);
} }
#endif #endif
...@@ -1870,7 +1870,7 @@ static void init_signals(void) ...@@ -1870,7 +1870,7 @@ static void init_signals(void)
struct rlimit rl; struct rlimit rl;
rl.rlim_cur = rl.rlim_max = RLIM_INFINITY; rl.rlim_cur = rl.rlim_max = RLIM_INFINITY;
if (setrlimit(RLIMIT_CORE, &rl) && global_system_variables.log_warnings) if (setrlimit(RLIMIT_CORE, &rl) && global_system_variables.log_warnings)
sql_print_error("Warning: setrlimit could not change the size of core files to 'infinity'; We may not be able to generate a core file on signals"); sql_print_warning("setrlimit could not change the size of core files to 'infinity'; We may not be able to generate a core file on signals");
} }
#endif #endif
(void) sigemptyset(&set); (void) sigemptyset(&set);
...@@ -2024,7 +2024,7 @@ extern "C" void *signal_hand(void *arg __attribute__((unused))) ...@@ -2024,7 +2024,7 @@ extern "C" void *signal_hand(void *arg __attribute__((unused)))
case SIGQUIT: case SIGQUIT:
case SIGKILL: case SIGKILL:
#ifdef EXTRA_DEBUG #ifdef EXTRA_DEBUG
sql_print_error("Got signal %d to shutdown mysqld",sig); sql_print_information("Got signal %d to shutdown mysqld",sig);
#endif #endif
DBUG_PRINT("info",("Got signal: %d abort_loop: %d",sig,abort_loop)); DBUG_PRINT("info",("Got signal: %d abort_loop: %d",sig,abort_loop));
if (!abort_loop) if (!abort_loop)
...@@ -2036,7 +2036,7 @@ extern "C" void *signal_hand(void *arg __attribute__((unused))) ...@@ -2036,7 +2036,7 @@ extern "C" void *signal_hand(void *arg __attribute__((unused)))
my_pthread_attr_setprio(&connection_attrib,INTERRUPT_PRIOR); my_pthread_attr_setprio(&connection_attrib,INTERRUPT_PRIOR);
if (pthread_create(&tmp,&connection_attrib, kill_server_thread, if (pthread_create(&tmp,&connection_attrib, kill_server_thread,
(void*) sig)) (void*) sig))
sql_print_error("Error: Can't create thread to kill server"); sql_print_error("Can't create thread to kill server");
#else #else
kill_server((void*) sig); // MIT THREAD has a alarm thread kill_server((void*) sig); // MIT THREAD has a alarm thread
#endif #endif
...@@ -2060,7 +2060,7 @@ extern "C" void *signal_hand(void *arg __attribute__((unused))) ...@@ -2060,7 +2060,7 @@ extern "C" void *signal_hand(void *arg __attribute__((unused)))
#endif #endif
default: default:
#ifdef EXTRA_DEBUG #ifdef EXTRA_DEBUG
sql_print_error("Warning: Got signal: %d error: %d",sig,error); /* purecov: tested */ sql_print_warning("Got signal: %d error: %d",sig,error); /* purecov: tested */
#endif #endif
break; /* purecov: tested */ break; /* purecov: tested */
} }
...@@ -2339,11 +2339,11 @@ static int init_common_variables(const char *conf_file_name, int argc, ...@@ -2339,11 +2339,11 @@ static int init_common_variables(const char *conf_file_name, int argc,
("Changed limits: max_open_files: %u max_connections: %ld table_cache: %ld", ("Changed limits: max_open_files: %u max_connections: %ld table_cache: %ld",
files, max_connections, table_cache_size)); files, max_connections, table_cache_size));
if (global_system_variables.log_warnings) if (global_system_variables.log_warnings)
sql_print_error("Warning: Changed limits: max_open_files: %u max_connections: %ld table_cache: %ld", sql_print_warning("Changed limits: max_open_files: %u max_connections: %ld table_cache: %ld",
files, max_connections, table_cache_size); files, max_connections, table_cache_size);
} }
else if (global_system_variables.log_warnings) else if (global_system_variables.log_warnings)
sql_print_error("Warning: Could not increase number of max_open_files to more than %u (request: %u)", files, wanted_files); sql_print_warning("Could not increase number of max_open_files to more than %u (request: %u)", files, wanted_files);
} }
open_files_limit= files; open_files_limit= files;
} }
...@@ -2523,8 +2523,8 @@ static int init_server_components() ...@@ -2523,8 +2523,8 @@ static int init_server_components()
} }
else if (opt_log_slave_updates) else if (opt_log_slave_updates)
{ {
sql_print_error("\ sql_print_warning("\
Warning: you need to use --log-bin to make --log-slave-updates work. \ you need to use --log-bin to make --log-slave-updates work. \
Now disabling --log-slave-updates."); Now disabling --log-slave-updates.");
} }
...@@ -2532,7 +2532,7 @@ Now disabling --log-slave-updates."); ...@@ -2532,7 +2532,7 @@ Now disabling --log-slave-updates.");
if (opt_log_slave_updates && replicate_same_server_id) if (opt_log_slave_updates && replicate_same_server_id)
{ {
sql_print_error("\ sql_print_error("\
Error: using --replicate-same-server-id in conjunction with \ using --replicate-same-server-id in conjunction with \
--log-slave-updates is impossible, it would lead to infinite loops in this \ --log-slave-updates is impossible, it would lead to infinite loops in this \
server."); server.");
unireg_abort(1); unireg_abort(1);
...@@ -2561,12 +2561,12 @@ server."); ...@@ -2561,12 +2561,12 @@ server.");
if (opt_innodb_safe_binlog) if (opt_innodb_safe_binlog)
{ {
if (have_innodb != SHOW_OPTION_YES) if (have_innodb != SHOW_OPTION_YES)
sql_print_error("Warning: --innodb-safe-binlog is meaningful only if " sql_print_warning("--innodb-safe-binlog is meaningful only if "
"the InnoDB storage engine is enabled in the server."); "the InnoDB storage engine is enabled in the server.");
#ifdef HAVE_INNOBASE_DB #ifdef HAVE_INNOBASE_DB
if (innobase_flush_log_at_trx_commit != 1) if (innobase_flush_log_at_trx_commit != 1)
{ {
sql_print_error("Warning: --innodb-safe-binlog is meaningful only if " sql_print_warning("--innodb-safe-binlog is meaningful only if "
"innodb_flush_log_at_trx_commit is 1; now setting it " "innodb_flush_log_at_trx_commit is 1; now setting it "
"to 1."); "to 1.");
innobase_flush_log_at_trx_commit= 1; innobase_flush_log_at_trx_commit= 1;
...@@ -2578,14 +2578,14 @@ server."); ...@@ -2578,14 +2578,14 @@ server.");
good (especially "littlesync", and on Windows... see good (especially "littlesync", and on Windows... see
srv/srv0start.c). srv/srv0start.c).
*/ */
sql_print_error("Warning: --innodb-safe-binlog requires that " sql_print_warning("--innodb-safe-binlog requires that "
"the innodb_flush_method actually synchronizes the " "the innodb_flush_method actually synchronizes the "
"InnoDB log to disk; it is your responsibility " "InnoDB log to disk; it is your responsibility "
"to verify that the method you chose does it."); "to verify that the method you chose does it.");
} }
if (sync_binlog_period != 1) if (sync_binlog_period != 1)
{ {
sql_print_error("Warning: --innodb-safe-binlog is meaningful only if " sql_print_warning("--innodb-safe-binlog is meaningful only if "
"the global sync_binlog variable is 1; now setting it " "the global sync_binlog variable is 1; now setting it "
"to 1."); "to 1.");
sync_binlog_period= 1; sync_binlog_period= 1;
...@@ -2624,7 +2624,7 @@ server."); ...@@ -2624,7 +2624,7 @@ server.");
if (mlockall(MCL_CURRENT)) if (mlockall(MCL_CURRENT))
{ {
if (global_system_variables.log_warnings) if (global_system_variables.log_warnings)
sql_print_error("Warning: Failed to lock memory. Errno: %d\n",errno); sql_print_warning("Failed to lock memory. Errno: %d\n",errno);
locked_in_memory= 0; locked_in_memory= 0;
} }
} }
...@@ -2650,7 +2650,7 @@ static void create_maintenance_thread() ...@@ -2650,7 +2650,7 @@ static void create_maintenance_thread()
{ {
pthread_t hThread; pthread_t hThread;
if (pthread_create(&hThread,&connection_attrib,handle_manager,0)) if (pthread_create(&hThread,&connection_attrib,handle_manager,0))
sql_print_error("Warning: Can't create thread to manage maintenance"); sql_print_warning("Can't create thread to manage maintenance");
} }
} }
...@@ -2662,7 +2662,7 @@ static void create_shutdown_thread() ...@@ -2662,7 +2662,7 @@ static void create_shutdown_thread()
hEventShutdown=CreateEvent(0, FALSE, FALSE, shutdown_event_name); hEventShutdown=CreateEvent(0, FALSE, FALSE, shutdown_event_name);
pthread_t hThread; pthread_t hThread;
if (pthread_create(&hThread,&connection_attrib,handle_shutdown,0)) if (pthread_create(&hThread,&connection_attrib,handle_shutdown,0))
sql_print_error("Warning: Can't create thread to handle shutdown requests"); sql_print_warning("Can't create thread to handle shutdown requests");
// On "Stop Service" we have to do regular shutdown // On "Stop Service" we have to do regular shutdown
Service.SetShutdownEvent(hEventShutdown); Service.SetShutdownEvent(hEventShutdown);
...@@ -2671,7 +2671,7 @@ static void create_shutdown_thread() ...@@ -2671,7 +2671,7 @@ static void create_shutdown_thread()
pthread_cond_init(&eventShutdown, NULL); pthread_cond_init(&eventShutdown, NULL);
pthread_t hThread; pthread_t hThread;
if (pthread_create(&hThread,&connection_attrib,handle_shutdown,0)) if (pthread_create(&hThread,&connection_attrib,handle_shutdown,0))
sql_print_error("Warning: Can't create thread to handle shutdown requests"); sql_print_warning("Can't create thread to handle shutdown requests");
#endif #endif
#endif // EMBEDDED_LIBRARY #endif // EMBEDDED_LIBRARY
} }
...@@ -2702,7 +2702,7 @@ static void handle_connections_methods() ...@@ -2702,7 +2702,7 @@ static void handle_connections_methods()
if (pthread_create(&hThread,&connection_attrib, if (pthread_create(&hThread,&connection_attrib,
handle_connections_namedpipes, 0)) handle_connections_namedpipes, 0))
{ {
sql_print_error("Warning: Can't create thread to handle named pipes"); sql_print_warning("Can't create thread to handle named pipes");
handler_count--; handler_count--;
} }
} }
...@@ -2713,7 +2713,7 @@ static void handle_connections_methods() ...@@ -2713,7 +2713,7 @@ static void handle_connections_methods()
if (pthread_create(&hThread,&connection_attrib, if (pthread_create(&hThread,&connection_attrib,
handle_connections_sockets, 0)) handle_connections_sockets, 0))
{ {
sql_print_error("Warning: Can't create thread to handle TCP/IP"); sql_print_warning("Can't create thread to handle TCP/IP");
handler_count--; handler_count--;
} }
} }
...@@ -2724,7 +2724,7 @@ static void handle_connections_methods() ...@@ -2724,7 +2724,7 @@ static void handle_connections_methods()
if (pthread_create(&hThread,&connection_attrib, if (pthread_create(&hThread,&connection_attrib,
handle_connections_shared_memory, 0)) handle_connections_shared_memory, 0))
{ {
sql_print_error("Warning: Can't create thread to handle shared memory"); sql_print_warning("Can't create thread to handle shared memory");
handler_count--; handler_count--;
} }
} }
...@@ -2784,7 +2784,7 @@ int main(int argc, char **argv) ...@@ -2784,7 +2784,7 @@ int main(int argc, char **argv)
if (stack_size && stack_size < thread_stack) if (stack_size && stack_size < thread_stack)
{ {
if (global_system_variables.log_warnings) if (global_system_variables.log_warnings)
sql_print_error("Warning: Asked for %ld thread stack, but got %ld", sql_print_warning("Asked for %ld thread stack, but got %ld",
thread_stack, stack_size); thread_stack, stack_size);
thread_stack= stack_size; thread_stack= stack_size;
} }
...@@ -2807,8 +2807,8 @@ int main(int argc, char **argv) ...@@ -2807,8 +2807,8 @@ int main(int argc, char **argv)
if (lower_case_table_names_used) if (lower_case_table_names_used)
{ {
if (global_system_variables.log_warnings) if (global_system_variables.log_warnings)
sql_print_error("\ sql_print_warning("\
Warning: You have forced lower_case_table_names to 0 through a command-line \ You have forced lower_case_table_names to 0 through a command-line \
option, even though your file system '%s' is case insensitive. This means \ option, even though your file system '%s' is case insensitive. This means \
that you can corrupt a MyISAM table by accessing it with different cases. \ that you can corrupt a MyISAM table by accessing it with different cases. \
You should consider changing lower_case_table_names to 1 or 2", You should consider changing lower_case_table_names to 1 or 2",
...@@ -2817,7 +2817,7 @@ You should consider changing lower_case_table_names to 1 or 2", ...@@ -2817,7 +2817,7 @@ You should consider changing lower_case_table_names to 1 or 2",
else else
{ {
if (global_system_variables.log_warnings) if (global_system_variables.log_warnings)
sql_print_error("Warning: Setting lower_case_table_names=2 because file system for %s is case insensitive", mysql_real_data_home); sql_print_warning("Setting lower_case_table_names=2 because file system for %s is case insensitive", mysql_real_data_home);
lower_case_table_names= 2; lower_case_table_names= 2;
} }
} }
...@@ -2850,14 +2850,14 @@ You should consider changing lower_case_table_names to 1 or 2", ...@@ -2850,14 +2850,14 @@ You should consider changing lower_case_table_names to 1 or 2",
#ifdef EXTRA_DEBUG #ifdef EXTRA_DEBUG
switch (server_id) { switch (server_id) {
case 1: case 1:
sql_print_error("\ sql_print_warning("\
Warning: You have enabled the binary log, but you haven't set server-id to \ You have enabled the binary log, but you haven't set server-id to \
a non-zero value: we force server id to 1; updates will be logged to the \ a non-zero value: we force server id to 1; updates will be logged to the \
binary log, but connections from slaves will not be accepted."); binary log, but connections from slaves will not be accepted.");
break; break;
case 2: case 2:
sql_print_error("\ sql_print_warning("\
Warning: You should set server-id to a non-0 value if master_host is set; \ You should set server-id to a non-0 value if master_host is set; \
we force server id to 2, but this MySQL server will not act as a slave."); we force server id to 2, but this MySQL server will not act as a slave.");
break; break;
} }
...@@ -3197,7 +3197,7 @@ static int bootstrap(FILE *file) ...@@ -3197,7 +3197,7 @@ static int bootstrap(FILE *file)
if (pthread_create(&thd->real_id,&connection_attrib,handle_bootstrap, if (pthread_create(&thd->real_id,&connection_attrib,handle_bootstrap,
(void*) thd)) (void*) thd))
{ {
sql_print_error("Warning: Can't create thread to handle bootstrap"); sql_print_warning("Can't create thread to handle bootstrap");
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
/* Wait for thread to die */ /* Wait for thread to die */
...@@ -5606,7 +5606,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -5606,7 +5606,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
if (!mysqld_user || !strcmp(mysqld_user, argument)) if (!mysqld_user || !strcmp(mysqld_user, argument))
mysqld_user= argument; mysqld_user= argument;
else else
fprintf(stderr, "Warning: Ignoring user change to '%s' because the user was set to '%s' earlier on the command line\n", argument, mysqld_user); sql_print_warning("Ignoring user change to '%s' because the user was set to '%s' earlier on the command line\n", argument, mysqld_user);
break; break;
case 'L': case 'L':
strmake(language, argument, sizeof(language)-1); strmake(language, argument, sizeof(language)-1);
...@@ -6391,7 +6391,7 @@ static int test_if_case_insensitive(const char *dir_name) ...@@ -6391,7 +6391,7 @@ static int test_if_case_insensitive(const char *dir_name)
(void) my_delete(buff2, MYF(0)); (void) my_delete(buff2, MYF(0));
if ((file= my_create(buff, 0666, O_RDWR, MYF(0))) < 0) if ((file= my_create(buff, 0666, O_RDWR, MYF(0))) < 0)
{ {
sql_print_error("Warning: Can't create test file %s", buff); sql_print_warning("Can't create test file %s", buff);
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
my_close(file, MYF(0)); my_close(file, MYF(0));
......
sql/sql_acl.cc
View file @ 6bc2acce
...@@ -251,7 +251,7 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables) ...@@ -251,7 +251,7 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables)
{ {
global_system_variables.old_passwords= 1; global_system_variables.old_passwords= 1;
pthread_mutex_unlock(&LOCK_global_system_variables); pthread_mutex_unlock(&LOCK_global_system_variables);
sql_print_error("mysql.user table is not updated to new password format; " sql_print_warning("mysql.user table is not updated to new password format; "
"Disabling new password usage until " "Disabling new password usage until "
"mysql_fix_privilege_tables is run"); "mysql_fix_privilege_tables is run");
} }
......
sql/tztime.cc
View file @ 6bc2acce
...@@ -1560,7 +1560,7 @@ my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap) ...@@ -1560,7 +1560,7 @@ my_tz_init(THD *org_thd, const char *default_tzname, my_bool bootstrap)
if (open_tables(thd, tables_buff, &counter) || if (open_tables(thd, tables_buff, &counter) ||
lock_tables(thd, tables_buff, counter)) lock_tables(thd, tables_buff, counter))
{ {
sql_print_error("Warning: Can't open and lock time zone table: %s " sql_print_warning("Can't open and lock time zone table: %s "
"trying to live without them", thd->net.last_error); "trying to live without them", thd->net.last_error);
/* We will try emulate that everything is ok */ /* We will try emulate that everything is ok */
return_val= time_zone_tables_exist= 0; return_val= time_zone_tables_exist= 0;
...@@ -1740,8 +1740,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables) ...@@ -1740,8 +1740,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
if (!(alloc_buff= alloc_root(&tz_storage, sizeof(TIME_ZONE_INFO) + if (!(alloc_buff= alloc_root(&tz_storage, sizeof(TIME_ZONE_INFO) +
tz_name->length() + 1))) tz_name->length() + 1)))
{ {
sql_print_error("Error: Out of memory while loading time zone " sql_print_error("Out of memory while loading time zone description");
"description");
return 0; return 0;
} }
tz_info= (TIME_ZONE_INFO *)alloc_buff; tz_info= (TIME_ZONE_INFO *)alloc_buff;
...@@ -1770,7 +1769,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables) ...@@ -1770,7 +1769,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
if (table->file->index_read(table->record[0], (byte*)table->field[0]->ptr, if (table->file->index_read(table->record[0], (byte*)table->field[0]->ptr,
0, HA_READ_KEY_EXACT)) 0, HA_READ_KEY_EXACT))
{ {
sql_print_error("Error: Can't find description of time zone."); sql_print_error("Can't find description of time zone.");
goto end; goto end;
} }
...@@ -1791,7 +1790,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables) ...@@ -1791,7 +1790,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
if (table->file->index_read(table->record[0], (byte*)table->field[0]->ptr, if (table->file->index_read(table->record[0], (byte*)table->field[0]->ptr,
0, HA_READ_KEY_EXACT)) 0, HA_READ_KEY_EXACT))
{ {
sql_print_error("Error: Can't find description of time zone."); sql_print_error("Can't find description of time zone.");
goto end; goto end;
} }
...@@ -1948,8 +1947,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables) ...@@ -1948,8 +1947,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
#endif #endif
sizeof(TRAN_TYPE_INFO) * tz_info->typecnt))) sizeof(TRAN_TYPE_INFO) * tz_info->typecnt)))
{ {
sql_print_error("Error: Out of memory while loading time zone " sql_print_error("Out of memory while loading time zone description");
"description");
goto end; goto end;
} }
...@@ -1974,12 +1972,12 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables) ...@@ -1974,12 +1972,12 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
*/ */
if (tz_info->typecnt < 1) if (tz_info->typecnt < 1)
{ {
sql_print_error("Error: loading time zone without transition types"); sql_print_error("loading time zone without transition types");
goto end; goto end;
} }
if (prepare_tz_info(tz_info, &tz_storage)) if (prepare_tz_info(tz_info, &tz_storage))
{ {
sql_print_error("Error: Unable to build mktime map for time zone"); sql_print_error("Unable to build mktime map for time zone");
goto end; goto end;
} }
...@@ -1991,7 +1989,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables) ...@@ -1991,7 +1989,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
&my_charset_latin1), &my_charset_latin1),
my_hash_insert(&tz_names, (const byte *)tmp_tzname))) my_hash_insert(&tz_names, (const byte *)tmp_tzname)))
{ {
sql_print_error("Error: Out of memory while loading time zone"); sql_print_error("Out of memory while loading time zone");
goto end; goto end;
} }
......
strings/ctype-utf8.c
View file @ 6bc2acce
...@@ -1590,6 +1590,15 @@ static uchar to_upper_utf8[] = { ...@@ -1590,6 +1590,15 @@ static uchar to_upper_utf8[] = {
240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255
}; };
static inline int bincmp(const uchar *s, const uchar *se,
const uchar *t, const uchar *te)
{
int slen=se-s, tlen=te-t;
int len=min(slen,tlen);
int cmp= memcmp(s,t,len);
return cmp ? cmp : slen-tlen;
}
static int my_utf8_uni(CHARSET_INFO *cs __attribute__((unused)), static int my_utf8_uni(CHARSET_INFO *cs __attribute__((unused)),
my_wc_t * pwc, const uchar *s, const uchar *e) my_wc_t * pwc, const uchar *s, const uchar *e)
...@@ -1824,8 +1833,8 @@ static int my_strnncoll_utf8(CHARSET_INFO *cs, ...@@ -1824,8 +1833,8 @@ static int my_strnncoll_utf8(CHARSET_INFO *cs,
if ( s_res <= 0 || t_res <= 0 ) if ( s_res <= 0 || t_res <= 0 )
{ {
/* Incorrect string, compare by char value */ /* Incorrect string, compare byte by byte value */
return ((int)s[0]-(int)t[0]); return bincmp(s, se, t, te);
} }
plane=(s_wc>>8) & 0xFF; plane=(s_wc>>8) & 0xFF;
...@@ -1889,8 +1898,8 @@ static int my_strnncollsp_utf8(CHARSET_INFO *cs, ...@@ -1889,8 +1898,8 @@ static int my_strnncollsp_utf8(CHARSET_INFO *cs,
if ( s_res <= 0 || t_res <= 0 ) if ( s_res <= 0 || t_res <= 0 )
{ {
/* Incorrect string, compare by char value */ /* Incorrect string, compare byte by byte value */
return ((int)s[0]-(int)t[0]); return bincmp(s, se, t, te);
} }
plane=(s_wc>>8) & 0xFF; plane=(s_wc>>8) & 0xFF;
...@@ -1956,8 +1965,8 @@ static int my_strncasecmp_utf8(CHARSET_INFO *cs, ...@@ -1956,8 +1965,8 @@ static int my_strncasecmp_utf8(CHARSET_INFO *cs,
if ( s_res <= 0 || t_res <= 0 ) if ( s_res <= 0 || t_res <= 0 )
{ {
/* Incorrect string, compare by char value */ /* Incorrect string, compare byte by byte value */
return ((int)s[0]-(int)t[0]); return bincmp(s, se, t, te);
} }
plane=(s_wc>>8) & 0xFF; plane=(s_wc>>8) & 0xFF;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7