diff options
author | monty@mysql.com/narttu.mysql.fi <> | 2007-02-23 13:13:55 +0200 |
---|---|---|
committer | monty@mysql.com/narttu.mysql.fi <> | 2007-02-23 13:13:55 +0200 |
commit | f0ae3ce9b97f45b717201764c6af6e4bd4176e5c (patch) | |
tree | aa523ca58b5c098a79faefb22302aa717f4ae942 /strings | |
parent | a5051aa4ebaf48fae5f7b6f52889c3c66a12dd23 (diff) | |
download | mariadb-git-f0ae3ce9b97f45b717201764c6af6e4bd4176e5c.tar.gz |
Fixed compiler warnings
Fixed compile-pentium64 scripts
Fixed wrong estimate of update_with_key_prefix in sql-bench
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc
Split handle_one_connection() into reusable sub functions.
Split create_new_thread() into reusable sub functions.
Added thread_scheduler; Preliminary interface code for future thread_handling code.
Use 'my_thread_id' for internal thread id's
Make thr_alarm_kill() to depend on thread_id instead of thread
Make thr_abort_locks_for_thread() depend on thread_id instead of thread
In store_globals(), set my_thread_var->id to be thd->thread_id.
Use my_thread_var->id as basis for my_thread_name()
The above changes makes the connection we have between THD and threads more soft.
Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions
Fixed compiler warnings
Fixed core dumps when running with --debug
Removed setting of signal masks (was never used)
Made event code call pthread_exit() (portability fix)
Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called.
Made handling of thread_id and thd->variables.pseudo_thread_id uniform.
Removed one common 'not freed memory' warning from mysqltest
Fixed a couple of usage of not initialized warnings (unlikely cases)
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
Diffstat (limited to 'strings')
-rw-r--r-- | strings/ctype-ucs2.c | 5 | ||||
-rw-r--r-- | strings/ctype-utf8.c | 4 | ||||
-rw-r--r-- | strings/decimal.c | 3 | ||||
-rw-r--r-- | strings/my_strchr.c | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c index af5b9a50157..e09b653fd62 100644 --- a/strings/ctype-ucs2.c +++ b/strings/ctype-ucs2.c @@ -206,6 +206,7 @@ static int my_strnncoll_ucs2(CHARSET_INFO *cs, const uchar *se=s+slen; const uchar *te=t+tlen; MY_UNICASE_INFO **uni_plane= cs->caseinfo; + LINT_INIT(s_wc); while ( s < se && t < te ) { @@ -320,7 +321,8 @@ static int my_strncasecmp_ucs2(CHARSET_INFO *cs, const char *se=s+len; const char *te=t+len; MY_UNICASE_INFO **uni_plane= cs->caseinfo; - + LINT_INIT(s_wc); + while ( s < se && t < te ) { int plane; @@ -1382,6 +1384,7 @@ int my_strnncoll_ucs2_bin(CHARSET_INFO *cs, my_wc_t s_wc,t_wc; const uchar *se=s+slen; const uchar *te=t+tlen; + LINT_INIT(s_wc); while ( s < se && t < te ) { diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c index 87f984c21b5..827c274e84a 100644 --- a/strings/ctype-utf8.c +++ b/strings/ctype-utf8.c @@ -2312,6 +2312,7 @@ static int my_strnncoll_utf8(CHARSET_INFO *cs, const uchar *se=s+slen; const uchar *te=t+tlen; MY_UNICASE_INFO **uni_plane= cs->caseinfo; + LINT_INIT(s_wc); while ( s < se && t < te ) { @@ -2381,6 +2382,7 @@ static int my_strnncollsp_utf8(CHARSET_INFO *cs, my_wc_t s_wc,t_wc; const uchar *se= s+slen, *te= t+tlen; MY_UNICASE_INFO **uni_plane= cs->caseinfo; + LINT_INIT(s_wc); #ifndef VARCHAR_WITH_DIFF_ENDSPACE_ARE_DIFFERENT_FOR_UNIQUE diff_if_only_endspace_difference= 0; @@ -4101,7 +4103,7 @@ my_wc_mb_filename(CHARSET_INFO *cs __attribute__((unused)), char hex[]= "0123456789abcdef"; if (wc < 128 && filename_safe_char[wc]) { - *s= wc; + *s= (uchar) wc; return 1; } diff --git a/strings/decimal.c b/strings/decimal.c index 659550ce375..b29017aa6cb 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -1362,6 +1362,7 @@ int bin2decimal(char *from, decimal_t *to, int precision, int scale) { int i=dig2bytes[intg0x]; dec1 x; + LINT_INIT(x); switch (i) { case 1: x=mi_sint1korr(from); break; @@ -1403,6 +1404,7 @@ int bin2decimal(char *from, decimal_t *to, int precision, int scale) { int i=dig2bytes[frac0x]; dec1 x; + LINT_INIT(x); switch (i) { case 1: x=mi_sint1korr(from); break; @@ -1489,6 +1491,7 @@ decimal_round(decimal_t *from, decimal_t *to, int scale, sanity(to); + LINT_INIT(round_digit); switch (mode) { case HALF_UP: case HALF_EVEN: round_digit=5; break; diff --git a/strings/my_strchr.c b/strings/my_strchr.c index 8b19a1dd80a..6724bf39ff2 100644 --- a/strings/my_strchr.c +++ b/strings/my_strchr.c @@ -26,7 +26,7 @@ #include "m_ctype.h" -byte *my_strchr(CHARSET_INFO *cs, const char *str, const char *end, +char *my_strchr(CHARSET_INFO *cs, const char *str, const char *end, pchar c) { uint mbl; |