#At file:///export/home/tmp/ss156133/z/43414-51/ based on revid:sergey.glukhov@stripped
3112 Staale Smedseng 2009-09-17 [merge]
Merge from 5.0
modified:
include/my_global.h
mysys/hash.c
sql-common/my_time.c
sql/item_func.cc
sql/item_timefunc.cc
sql/sql_handler.cc
sql/udf_example.c
storage/heap/hp_write.c
storage/myisam/mi_search.c
storage/myisam/mi_write.c
=== modified file 'include/my_global.h'
--- a/include/my_global.h 2009-08-28 16:21:54 +0000
+++ b/include/my_global.h 2009-09-17 15:25:52 +0000
@@ -558,12 +558,6 @@ int __void__;
#define LINT_INIT(var)
#endif
-#if defined(_lint) || defined(FORCE_INIT_OF_VARS) || defined(HAVE_purify)
-#define PURIFY_OR_LINT_INIT(var) var=0
-#else
-#define PURIFY_OR_LINT_INIT(var)
-#endif
-
/*
Suppress uninitialized variable warning without generating code.
=== modified file 'mysys/hash.c'
--- a/mysys/hash.c 2009-06-22 11:10:34 +0000
+++ b/mysys/hash.c 2009-09-17 15:25:52 +0000
@@ -332,13 +332,8 @@ my_bool my_hash_insert(HASH *info, const
{
int flag;
size_t idx,halfbuff,hash_nr,first_index;
- uchar *ptr_to_rec,*ptr_to_rec2;
- HASH_LINK *data,*empty,*gpos,*gpos2,*pos;
-
- LINT_INIT(gpos);
- LINT_INIT(gpos2);
- LINT_INIT(ptr_to_rec);
- LINT_INIT(ptr_to_rec2);
+ uchar *UNINIT_VAR(ptr_to_rec),*UNINIT_VAR(ptr_to_rec2);
+ HASH_LINK *data,*empty,*UNINIT_VAR(gpos),*UNINIT_VAR(gpos2),*pos;
if (HASH_UNIQUE & info->flags)
{
=== modified file 'sql-common/my_time.c'
--- a/sql-common/my_time.c 2009-09-01 11:04:56 +0000
+++ b/sql-common/my_time.c 2009-09-17 15:25:52 +0000
@@ -165,7 +165,7 @@ str_to_datetime(const char *str, uint le
uint add_hours= 0, start_loop;
ulong not_zero_date, allow_space;
my_bool is_internal_format;
- const char *pos, *last_field_pos;
+ const char *pos, *UNINIT_VAR(last_field_pos);
const char *end=str+length;
const uchar *format_position;
my_bool found_delimitier= 0, found_space= 0;
@@ -174,7 +174,6 @@ str_to_datetime(const char *str, uint le
DBUG_PRINT("ENTER",("str: %.*s",length,str));
LINT_INIT(field_length);
- LINT_INIT(last_field_pos);
*was_cut= 0;
=== modified file 'sql/item_func.cc'
--- a/sql/item_func.cc 2009-08-31 14:09:09 +0000
+++ b/sql/item_func.cc 2009-09-17 15:25:52 +0000
@@ -435,8 +435,7 @@ bool Item_func::eq(const Item *item, boo
Field *Item_func::tmp_table_field(TABLE *table)
{
- Field *field;
- LINT_INIT(field);
+ Field *field= NULL;
switch (result_type()) {
case INT_RESULT:
@@ -4236,9 +4235,8 @@ void Item_func_set_user_var::save_item_r
bool
Item_func_set_user_var::update()
{
- bool res;
+ bool res= NULL;
DBUG_ENTER("Item_func_set_user_var::update");
- LINT_INIT(res);
switch (cached_result_type) {
case REAL_RESULT:
=== modified file 'sql/item_timefunc.cc'
--- a/sql/item_timefunc.cc 2009-08-28 10:55:59 +0000
+++ b/sql/item_timefunc.cc 2009-09-17 15:25:52 +0000
@@ -278,9 +278,9 @@ static bool extract_date_time(DATE_TIME_
int strict_week_number_year= -1;
int frac_part;
bool usa_time= 0;
- bool sunday_first_n_first_week_non_iso;
- bool strict_week_number;
- bool strict_week_number_year_type;
+ bool UNINIT_VAR(sunday_first_n_first_week_non_iso);
+ bool UNINIT_VAR(strict_week_number);
+ bool UNINIT_VAR(strict_week_number_year_type);
const char *val_begin= val;
const char *val_end= val + length;
const char *ptr= format->format.str;
@@ -288,11 +288,6 @@ static bool extract_date_time(DATE_TIME_
CHARSET_INFO *cs= &my_charset_bin;
DBUG_ENTER("extract_date_time");
- LINT_INIT(strict_week_number);
- /* Remove valgrind varnings when using gcc 3.3 and -O1 */
- PURIFY_OR_LINT_INIT(strict_week_number_year_type);
- PURIFY_OR_LINT_INIT(sunday_first_n_first_week_non_iso);
-
if (!sub_pattern_end)
bzero((char*) l_time, sizeof(*l_time));
=== modified file 'sql/sql_handler.cc'
--- a/sql/sql_handler.cc 2009-07-15 23:23:57 +0000
+++ b/sql/sql_handler.cc 2009-09-17 15:25:52 +0000
@@ -422,16 +422,13 @@ bool mysql_ha_read(THD *thd, TABLE_LIST
String buffer(buff, sizeof(buff), system_charset_info);
int error, keyno= -1;
uint num_rows;
- uchar *key;
- uint key_len;
+ uchar *UNINIT_VAR(key);
+ uint UNINIT_VAR(key_len);
bool need_reopen;
DBUG_ENTER("mysql_ha_read");
DBUG_PRINT("enter",("'%s'.'%s' as '%s'",
tables->db, tables->table_name, tables->alias));
- LINT_INIT(key);
- LINT_INIT(key_len);
-
thd->lex->select_lex.context.resolve_in_table_list_only(tables);
list.push_front(new Item_field(&thd->lex->select_lex.context,
NULL, NULL, "*"));
=== modified file 'sql/udf_example.c'
--- a/sql/udf_example.c 2009-02-13 16:41:47 +0000
+++ b/sql/udf_example.c 2009-09-17 15:25:52 +0000
@@ -139,10 +139,10 @@ typedef long long longlong;
#include <mysql.h>
#include <ctype.h>
-static pthread_mutex_t LOCK_hostname;
-
#ifdef HAVE_DLOPEN
+static pthread_mutex_t LOCK_hostname;
+
/* These must be right or mysqld will not find the symbol! */
my_bool metaphon_init(UDF_INIT *initid, UDF_ARGS *args, char *message);
=== modified file 'storage/heap/hp_write.c'
--- a/storage/heap/hp_write.c 2009-02-13 16:41:47 +0000
+++ b/storage/heap/hp_write.c 2009-09-17 15:25:52 +0000
@@ -196,13 +196,10 @@ int hp_write_key(HP_INFO *info, HP_KEYDE
HP_SHARE *share = info->s;
int flag;
ulong halfbuff,hashnr,first_index;
- uchar *ptr_to_rec,*ptr_to_rec2;
- HASH_INFO *empty,*gpos,*gpos2,*pos;
+ uchar *UNINIT_VAR(ptr_to_rec),*UNINIT_VAR(ptr_to_rec2);
+ HASH_INFO *empty,*UNINIT_VAR(gpos),*UNINIT_VAR(gpos2),*pos;
DBUG_ENTER("hp_write_key");
- LINT_INIT(gpos); LINT_INIT(gpos2);
- LINT_INIT(ptr_to_rec); LINT_INIT(ptr_to_rec2);
-
flag=0;
if (!(empty= hp_find_free_hash(share,&keyinfo->block,share->records)))
DBUG_RETURN(-1); /* No more memory */
=== modified file 'storage/myisam/mi_search.c'
--- a/storage/myisam/mi_search.c 2009-08-28 16:21:54 +0000
+++ b/storage/myisam/mi_search.c 2009-09-17 15:25:52 +0000
@@ -302,7 +302,8 @@ int _mi_prefix_search(MI_INFO *info, reg
uchar *end, *kseg, *vseg;
uchar *sort_order=keyinfo->seg->charset->sort_order;
uchar tt_buff[MI_MAX_KEY_BUFF+2], *t_buff=tt_buff+2;
- uchar *saved_from, *saved_to, *saved_vseg;
+ uchar *UNINIT_VAR(saved_from), *UNINIT_VAR(saved_to);
+ uchar *UNINIT_VAR(saved_vseg);
uint saved_length=0, saved_prefix_len=0;
uint length_pack;
DBUG_ENTER("_mi_prefix_search");
@@ -310,9 +311,6 @@ int _mi_prefix_search(MI_INFO *info, reg
LINT_INIT(length);
LINT_INIT(prefix_len);
LINT_INIT(seg_len_pack);
- LINT_INIT(saved_from);
- LINT_INIT(saved_to);
- LINT_INIT(saved_vseg);
t_buff[0]=0; /* Avoid bugs */
end= page+mi_getint(page);
=== modified file 'storage/myisam/mi_write.c'
--- a/storage/myisam/mi_write.c 2009-04-29 02:59:10 +0000
+++ b/storage/myisam/mi_write.c 2009-09-17 15:25:52 +0000
@@ -712,8 +712,8 @@ static uchar *_mi_find_last_pos(MI_KEYDE
uchar *key, uint *return_key_length,
uchar **after_key)
{
- uint keys,length,last_length,key_ref_length;
- uchar *end,*lastpos,*prevpos;
+ uint keys,length,UNINIT_VAR(last_length),key_ref_length;
+ uchar *end,*lastpos,*UNINIT_VAR(prevpos);
uchar key_buff[MI_MAX_KEY_BUFF];
DBUG_ENTER("_mi_find_last_pos");
@@ -732,8 +732,6 @@ static uchar *_mi_find_last_pos(MI_KEYDE
DBUG_RETURN(end);
}
- LINT_INIT(prevpos);
- LINT_INIT(last_length);
end=page+length-key_ref_length;
*key='\0';
length=0;
Attachment: [text/bzr-bundle] bzr/staale.smedseng@sun.com-20090917152552-4ayal3h40ebxg9lh.bundle
| Thread |
|---|
| • bzr commit into mysql-5.1-bugteam branch (staale.smedseng:3112) | Staale Smedseng | 17 Sep |
