summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--client/mysql.cc13
-rw-r--r--client/mysqlbinlog.cc6
-rw-r--r--client/mysqldump.c5
-rw-r--r--client/mysqltest.c5
-rw-r--r--myisam/ft_boolean_search.c11
-rw-r--r--myisam/mi_packrec.c7
-rw-r--r--myisam/rt_index.c7
-rw-r--r--myisam/sort.c3
-rw-r--r--mysql-test/r/fulltext.result3
-rw-r--r--mysql-test/t/fulltext.test1
-rw-r--r--mysys/mf_keycache.c1
-rw-r--r--mysys/mf_keycaches.c4
-rw-r--r--mysys/thr_alarm.c2
-rw-r--r--ndb/src/common/util/strdup.c4
-rw-r--r--sql/item_create.cc13
-rw-r--r--sql/item_strfunc.cc3
-rw-r--r--sql/item_timefunc.cc23
-rw-r--r--sql/log.cc4
-rw-r--r--sql/set_var.cc4
-rw-r--r--sql/slave.cc11
-rw-r--r--sql/sql_acl.cc12
-rw-r--r--sql/sql_acl.h2
-rw-r--r--sql/sql_analyse.cc59
-rw-r--r--sql/sql_base.cc15
-rw-r--r--sql/sql_cache.cc10
-rw-r--r--sql/sql_db.cc22
-rw-r--r--sql/sql_lex.cc3
-rw-r--r--sql/sql_parse.cc28
-rw-r--r--sql/sql_table.cc4
-rw-r--r--sql/sql_update.cc5
-rw-r--r--sql/table.cc4
-rw-r--r--sql/tztime.cc2
-rw-r--r--tests/client_test.c6
33 files changed, 157 insertions, 145 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index e178f79bcf3..bbba5be1cdf 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1430,12 +1430,6 @@ static void build_completion_hash(bool rehash, bool write_info)
if (status.batch || quick || !current_db)
DBUG_VOID_RETURN; // We don't need completion in batches
- if (tables)
- {
- mysql_free_result(tables);
- tables=0;
- }
-
/* hash SQL commands */
while (cmd->name) {
add_word(&ht,(char*) cmd->name);
@@ -1681,8 +1675,8 @@ static int com_server_help(String *buffer __attribute__((unused)),
else if (num_fields >= 2 && num_rows)
{
init_pager();
- char last_char;
-
+ char last_char= 0;
+
int num_name= 0, num_cat= 0;
LINT_INIT(num_name);
LINT_INIT(num_cat);
@@ -1693,7 +1687,6 @@ static int com_server_help(String *buffer __attribute__((unused)),
put_info("To make a more specific request, please type 'help <item>',\nwhere <item> is one of the following", INFO_INFO);
num_name= 0;
num_cat= 1;
- last_char= '_';
}
else if ((cur= mysql_fetch_row(result)))
{
@@ -1703,7 +1696,7 @@ static int com_server_help(String *buffer __attribute__((unused)),
num_cat= 2;
print_help_item(&cur,1,2,&last_char);
}
-
+
while ((cur= mysql_fetch_row(result)))
print_help_item(&cur,num_name,num_cat,&last_char);
tee_fprintf(PAGER, "\n");
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 7036deab2fe..6917797c03c 100644
--- a/client/mysqlbinlog.cc
+++ b/client/mysqlbinlog.cc
@@ -780,11 +780,7 @@ static int check_master_version(MYSQL* mysql,
if (mysql_query(mysql, "SELECT VERSION()") ||
!(res = mysql_store_result(mysql)))
- {
- mysql_close(mysql);
- die("Error checking master version: %s",
- mysql_error(mysql));
- }
+ die("Error checking master version: %s", mysql_error(mysql));
if (!(row = mysql_fetch_row(res)))
{
mysql_free_result(res);
diff --git a/client/mysqldump.c b/client/mysqldump.c
index 9b707af6107..757521fe935 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -2436,8 +2436,7 @@ static const char *check_if_ignore_table(const char *table_name)
fprintf(stderr,
"Error: Couldn't read status information for table %s (%s)\n",
table_name, mysql_error(sock));
- if (res)
- mysql_free_result(res);
+ mysql_free_result(res);
return 0; /* assume table is ok */
}
if (!(row[1]))
@@ -2448,7 +2447,7 @@ static const char *check_if_ignore_table(const char *table_name)
strcmp(row[1], (result= "MRG_ISAM")))
result= 0;
}
- mysql_free_result(res);
+ mysql_free_result(res);
return result;
}
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 9e887f61160..4d03746a5e5 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -733,9 +733,10 @@ VAR* var_get(const char* var_name, const char** var_name_end, my_bool raw,
die("Empty variable");
}
length= (uint) (var_name - save_var_name);
+ if (length >= MAX_VAR_NAME)
+ die("Too long variable name: %s", save_var_name);
- if (!(v = (VAR*) hash_search(&var_hash, save_var_name, length)) &&
- length < MAX_VAR_NAME)
+ if (!(v = (VAR*) hash_search(&var_hash, save_var_name, length)))
{
char buff[MAX_VAR_NAME+1];
strmake(buff, save_var_name, length);
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
index c38bffed665..4e66bd92a94 100644
--- a/myisam/ft_boolean_search.c
+++ b/myisam/ft_boolean_search.c
@@ -346,11 +346,12 @@ static void _ftb_init_index_search(FT_INFO *ftb)
if (ftbe->flags & FTB_FLAG_NO || /* 2 */
ftbe->up->ythresh - ftbe->up->yweaks >1) /* 1 */
{
- FTB_EXPR *top_ftbe=ftbe->up->up;
+ FTB_EXPR *top_ftbe=ftbe->up;
ftbw->docid[0]=HA_OFFSET_ERROR;
- for (ftbe=ftbw->up; ftbe != top_ftbe; ftbe=ftbe->up)
- if (!(ftbe->flags & FTB_FLAG_NO))
- ftbe->yweaks++;
+ for (ftbe=(FTB_EXPR *)ftbw;
+ ftbe != top_ftbe && !(ftbe->flags & FTB_FLAG_NO);
+ ftbe=ftbe->up)
+ ftbe->up->yweaks++;
ftbe=0;
break;
}
@@ -364,7 +365,7 @@ static void _ftb_init_index_search(FT_INFO *ftb)
else
reset_tree(& ftb->no_dupes);
}
-
+
if (_ft2_search(ftb, ftbw, 1))
return;
}
diff --git a/myisam/mi_packrec.c b/myisam/mi_packrec.c
index 62d15c03266..a8a27858d79 100644
--- a/myisam/mi_packrec.c
+++ b/myisam/mi_packrec.c
@@ -184,21 +184,14 @@ my_bool _mi_read_pack_info(MI_INFO *info, pbool fix_keys)
my_malloc((length+OFFSET_TABLE_SIZE)*sizeof(uint16)+
(uint) (share->pack.header_length+7),
MYF(MY_WME | MY_ZEROFILL))))
- {
- my_free((gptr) share->decode_trees,MYF(0));
goto err1;
- }
tmp_buff=share->decode_tables+length;
disk_cache=(byte*) (tmp_buff+OFFSET_TABLE_SIZE);
if (my_read(file,disk_cache,
(uint) (share->pack.header_length-sizeof(header)),
MYF(MY_NABP)))
- {
- my_free((gptr) share->decode_trees,MYF(0));
- my_free((gptr) share->decode_tables,MYF(0));
goto err2;
- }
huff_tree_bits=max_bit(trees ? trees-1 : 0);
init_bit_buffer(&bit_buff, (uchar*) disk_cache,
diff --git a/myisam/rt_index.c b/myisam/rt_index.c
index bdf5ee9c60f..97554dca4e6 100644
--- a/myisam/rt_index.c
+++ b/myisam/rt_index.c
@@ -948,15 +948,14 @@ int rtree_delete(MI_INFO *info, uint keynr, uchar *key, uint key_length)
/* check for redundant root (not leaf, 1 child) and eliminate */
if ((old_root = info->s->state.key_root[keynr]) == HA_OFFSET_ERROR)
goto err1;
- if (!_mi_fetch_keypage(info, keyinfo, old_root, DFLT_INIT_HITS,
+ if (!_mi_fetch_keypage(info, keyinfo, old_root, DFLT_INIT_HITS,
info->buff, 0))
goto err1;
nod_flag = mi_test_if_nod(info->buff);
page_size = mi_getint(info->buff);
- if (nod_flag && (page_size == 2 + key_length +
- (nod_flag ? nod_flag : info->s->base.rec_reflength)))
+ if (nod_flag && (page_size == 2 + key_length + nod_flag))
{
- my_off_t new_root = _mi_kpos(nod_flag,
+ my_off_t new_root = _mi_kpos(nod_flag,
rt_PAGE_FIRST_KEY(info->buff, nod_flag));
if (_mi_dispose(info, keyinfo, old_root, DFLT_INIT_HITS))
goto err1;
diff --git a/myisam/sort.c b/myisam/sort.c
index 09dd45f388c..9d2af2e8c70 100644
--- a/myisam/sort.c
+++ b/myisam/sort.c
@@ -162,7 +162,10 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
{
if (my_init_dynamic_array(&buffpek, sizeof(BUFFPEK), maxbuffer,
maxbuffer/2))
+ {
my_free((gptr) sort_keys,MYF(0));
+ sort_keys= 0;
+ }
else
break;
}
diff --git a/mysql-test/r/fulltext.result b/mysql-test/r/fulltext.result
index a85cfd4181c..f50cae79608 100644
--- a/mysql-test/r/fulltext.result
+++ b/mysql-test/r/fulltext.result
@@ -148,6 +148,9 @@ select * from t1 where MATCH a,b AGAINST ('+(support collections) +foobar*' IN B
a b
select * from t1 where MATCH a,b AGAINST ('+(+(support collections)) +foobar*' IN BOOLEAN MODE);
a b
+select * from t1 where MATCH a,b AGAINST ('+collections -supp* -foobar*' IN BOOLEAN MODE);
+a b
+Full-text indexes are called collections
select * from t1 where MATCH a,b AGAINST ('"xt indexes"' IN BOOLEAN MODE);
a b
select * from t1 where MATCH a,b AGAINST('"space model' IN BOOLEAN MODE);
diff --git a/mysql-test/t/fulltext.test b/mysql-test/t/fulltext.test
index 008e965297f..62dcecaff68 100644
--- a/mysql-test/t/fulltext.test
+++ b/mysql-test/t/fulltext.test
@@ -67,6 +67,7 @@ select * from t1 where MATCH a,b AGAINST ('"xt indexes"' IN BOOLEAN MODE);
select * from t1 where MATCH a,b AGAINST ('+(support collections) +foobar*' IN BOOLEAN MODE);
select * from t1 where MATCH a,b AGAINST ('+(+(support collections)) +foobar*' IN BOOLEAN MODE);
+select * from t1 where MATCH a,b AGAINST ('+collections -supp* -foobar*' IN BOOLEAN MODE);
select * from t1 where MATCH a,b AGAINST ('"xt indexes"' IN BOOLEAN MODE);
# bug#2708, bug#3870 crash
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index 5c9d1434b0c..4967b60cd68 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -352,6 +352,7 @@ int init_key_cache(KEY_CACHE *keycache, uint key_cache_block_size,
MYF(0))))
break;
my_large_free(keycache->block_mem, MYF(0));
+ keycache->block_mem= 0;
}
if (blocks < 8)
{
diff --git a/mysys/mf_keycaches.c b/mysys/mf_keycaches.c
index fee3096de52..38fef31fdd4 100644
--- a/mysys/mf_keycaches.c
+++ b/mysys/mf_keycaches.c
@@ -275,7 +275,11 @@ static void safe_hash_change(SAFE_HASH *hash, byte *old_data, byte *new_data)
if (entry->data == old_data)
{
if (new_data == hash->default_value)
+ {
+ if ((*entry->prev= entry->next))
+ entry->next->prev= entry->prev;
hash_delete(&hash->hash, (byte*) entry);
+ }
else
entry->data= new_data;
}
diff --git a/mysys/thr_alarm.c b/mysys/thr_alarm.c
index caef1caaf3d..19611a6027a 100644
--- a/mysys/thr_alarm.c
+++ b/mysys/thr_alarm.c
@@ -248,7 +248,7 @@ void thr_end_alarm(thr_alarm_t *alarmed)
if (alarm_data->malloced)
my_free((gptr) alarm_data,MYF(0));
found++;
-#ifndef DBUG_OFF
+#ifdef DBUG_OFF
break;
#endif
}
diff --git a/ndb/src/common/util/strdup.c b/ndb/src/common/util/strdup.c
index afe2306427e..d8f4d99bd28 100644
--- a/ndb/src/common/util/strdup.c
+++ b/ndb/src/common/util/strdup.c
@@ -21,8 +21,8 @@
char *
strdup(const char *s){
void *p2;
- p2 = malloc(strlen(s)+1);
- strcpy(p2, s);
+ if ((p2 = malloc(strlen(s)+1)))
+ strcpy(p2, s);
return p2;
}
#endif
diff --git a/sql/item_create.cc b/sql/item_create.cc
index cec6de3eede..8a5aeb6c9b7 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -358,22 +358,19 @@ Item *create_func_sin(Item* a)
Item *create_func_sha(Item* a)
{
- return new Item_func_sha(a);
+ return new Item_func_sha(a);
}
-
+
Item *create_func_space(Item *a)
{
CHARSET_INFO *cs= current_thd->variables.collation_connection;
Item *sp;
-
+
if (cs->mbminlen > 1)
{
+ uint dummy_errors;
sp= new Item_string("",0,cs);
- if (sp)
- {
- uint dummy_errors;
- sp->str_value.copy(" ", 1, &my_charset_latin1, cs, &dummy_errors);
- }
+ sp->str_value.copy(" ", 1, &my_charset_latin1, cs, &dummy_errors);
}
else
{
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 5d018b22055..f9843692b7b 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -2519,6 +2519,9 @@ String* Item_func_export_set::val_str(String* str)
case 3:
sep_buf.set(",", 1, default_charset());
sep = &sep_buf;
+ break;
+ default:
+ DBUG_ASSERT(0); // cannot happen
}
null_value=0;
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 0c1cd3cbad3..32813454fef 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -2131,20 +2131,25 @@ void Item_char_typecast::print(String *str)
String *Item_char_typecast::val_str(String *str)
{
DBUG_ASSERT(fixed == 1);
- String *res, *res1;
+ String *res;
uint32 length;
- if (!charset_conversion && !(res= args[0]->val_str(str)))
+#if 0
+ if (!charset_conversion)
{
- null_value= 1;
- return 0;
+ if (!(res= args[0]->val_str(str)))
+ {
+ null_value= 1;
+ return 0;
+ }
}
else
+#endif
{
// Convert character set if differ
uint dummy_errors;
- if (!(res1= args[0]->val_str(&tmp_value)) ||
- str->copy(res1->ptr(), res1->length(), res1->charset(),
+ if (!(res= args[0]->val_str(&tmp_value)) ||
+ str->copy(res->ptr(), res->length(), res->charset(),
cast_cs, &dummy_errors))
{
null_value= 1;
@@ -2154,13 +2159,13 @@ String *Item_char_typecast::val_str(String *str)
}
res->set_charset(cast_cs);
-
+
/*
Cut the tail if cast with length
and the result is longer than cast length, e.g.
CAST('string' AS CHAR(1))
*/
- if (cast_length >= 0 &&
+ if (cast_length >= 0 &&
(res->length() > (length= (uint32) res->charpos(cast_length))))
{ // Safe even if const arg
if (!res->alloced_length())
@@ -2169,7 +2174,7 @@ String *Item_char_typecast::val_str(String *str)
res= &str_value;
}
res->length((uint) length);
- }
+ }
null_value= 0;
return res;
}
diff --git a/sql/log.cc b/sql/log.cc
index d57a6b49762..6c97581d144 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2257,9 +2257,9 @@ void print_buffer_to_nt_eventlog(enum loglevel level, char *buff,
DBUG_ENTER("print_buffer_to_nt_eventlog");
buffptr= buff;
- if (length > (uint)(buffLen-4))
+ if (length > (uint)(buffLen-5))
{
- char *newBuff= new char[length + 4];
+ char *newBuff= new char[length + 5];
strcpy(newBuff, buff);
buffptr= newBuff;
}
diff --git a/sql/set_var.cc b/sql/set_var.cc
index c5c37a86c61..e18f28dc133 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -3033,8 +3033,8 @@ int set_var_password::check(THD *thd)
if (!user->host.str)
user->host.str= (char*) thd->host_or_ip;
/* Returns 1 as the function sends error to client */
- return check_change_password(thd, user->host.str, user->user.str, password) ?
- 1 : 0;
+ return check_change_password(thd, user->host.str, user->user.str,
+ password, strlen(password)) ? 1 : 0;
#else
return 0;
#endif
diff --git a/sql/slave.cc b/sql/slave.cc
index 5332dbf9c5b..0c5ebe0744a 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2610,18 +2610,19 @@ int st_relay_log_info::wait_for_pos(THD* thd, String* log_name,
init_abort_pos_wait= abort_pos_wait;
/*
- We'll need to
+ We'll need to
handle all possible log names comparisons (e.g. 999 vs 1000).
- We use ulong for string->number conversion ; this is no
+ We use ulong for string->number conversion ; this is no
stronger limitation than in find_uniq_filename in sql/log.cc
*/
ulong log_name_extension;
char log_name_tmp[FN_REFLEN]; //make a char[] from String
- char *end= strmake(log_name_tmp, log_name->ptr(), min(log_name->length(),
- FN_REFLEN-1));
+
+ strmake(log_name_tmp, log_name->ptr(), min(log_name->length(), FN_REFLEN-1));
+
char *p= fn_ext(log_name_tmp);
char *p_end;
- if (!*p || log_pos<0)
+ if (!*p || log_pos<0)
{
error= -2; //means improper arguments
goto err;
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index bcad0e627f4..f9d95b2cde5 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -1240,6 +1240,10 @@ bool acl_check_host(const char *host, const char *ip)
thd THD
host hostname for the user
user user name
+ new_password new password
+
+ NOTE:
+ new_password cannot be NULL
RETURN VALUE
0 OK
@@ -1247,7 +1251,7 @@ bool acl_check_host(const char *host, const char *ip)
*/
bool check_change_password(THD *thd, const char *host, const char *user,
- char *new_password)
+ char *new_password, uint new_password_len)
{
if (!initialized)
{
@@ -1296,12 +1300,13 @@ bool check_change_password(THD *thd, const char *host, const char *user,
bool change_password(THD *thd, const char *host, const char *user,
char *new_password)
{
+ uint new_password_len= strlen(new_password);
DBUG_ENTER("change_password");
DBUG_PRINT("enter",("host: '%s' user: '%s' new_password: '%s'",
host,user,new_password));
DBUG_ASSERT(host != 0); // Ensured by parent
- if (check_change_password(thd, host, user, new_password))
+ if (check_change_password(thd, host, user, new_password, new_password_len))
DBUG_RETURN(1);
VOID(pthread_mutex_lock(&acl_cache->lock));
@@ -1313,7 +1318,6 @@ bool change_password(THD *thd, const char *host, const char *user,
DBUG_RETURN(1);
}
/* update loaded acl entry: */
- uint new_password_len= new_password ? strlen(new_password) : 0;
set_user_salt(acl_user, new_password, new_password_len);
if (update_user_table(thd,
@@ -3241,7 +3245,7 @@ end:
SYNOPSIS
grant_reload()
- thd Thread handler
+ thd Thread handler (can be NULL)
NOTES
Locked tables are checked by acl_init and doesn't have to be checked here
diff --git a/sql/sql_acl.h b/sql/sql_acl.h
index b129ffcdcf8..3a9df84a35d 100644
--- a/sql/sql_acl.h
+++ b/sql/sql_acl.h
@@ -176,7 +176,7 @@ int acl_getroot(THD *thd, USER_RESOURCES *mqh, const char *passwd,
int acl_getroot_no_password(THD *thd);
bool acl_check_host(const char *host, const char *ip);
bool check_change_password(THD *thd, const char *host, const char *user,
- char *password);
+ char *password, uint password_len);
bool change_password(THD *thd, const char *host, const char *user,
char *password);
bool mysql_grant(THD *thd, const char *db, List <LEX_USER> &user_list,
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index 6a9a9e51231..ce58c585061 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -70,6 +70,9 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
field_info **f_info;
DBUG_ENTER("proc_analyse_init");
+ if (!pc)
+ DBUG_RETURN(0);
+
if (!(param = param->next))
{
pc->max_tree_elements = MAX_TREE_ELEMENTS;
@@ -81,33 +84,30 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
if ((*param->item)->type() != Item::INT_ITEM ||
(*param->item)->val_real() < 0)
{
- delete pc;
my_error(ER_WRONG_PARAMETERS_TO_PROCEDURE, MYF(0), proc_name);
- DBUG_RETURN(0);
+ goto err;
}
pc->max_tree_elements = (uint) (*param->item)->val_int();
param = param->next;
if (param->next) // no third parameter possible
{
my_error(ER_WRONG_PARAMCOUNT_TO_PROCEDURE, MYF(0), proc_name);
- DBUG_RETURN(0);
+ goto err;
}
// second parameter
if ((*param->item)->type() != Item::INT_ITEM ||
(*param->item)->val_real() < 0)
{
- delete pc;
my_error(ER_WRONG_PARAMETERS_TO_PROCEDURE, MYF(0), proc_name);
- DBUG_RETURN(0);
+ goto err;
}
pc->max_treemem = (uint) (*param->item)->val_int();
}
else if ((*param->item)->type() != Item::INT_ITEM ||
(*param->item)->val_real() < 0)
{
- delete pc;
my_error(ER_WRONG_PARAMETERS_TO_PROCEDURE, MYF(0), proc_name);
- DBUG_RETURN(0);
+ goto err;
}
// if only one parameter was given, it will be the value of max_tree_elements
else
@@ -116,34 +116,39 @@ proc_analyse_init(THD *thd, ORDER *param, select_result *result,
pc->max_treemem = MAX_TREEMEM;
}
- if (!pc || !(pc->f_info = (field_info**)
- sql_alloc(sizeof(field_info*)*field_list.elements)))
- DBUG_RETURN(0);
+ if (!(pc->f_info=
+ (field_info**)sql_alloc(sizeof(field_info*)*field_list.elements)))
+ goto err;
pc->f_end = pc->f_info + field_list.elements;
pc->fields = field_list;
- List_iterator_fast<Item> it(pc->fields);
- f_info = pc->f_info;
-
- Item *item;
- while ((item = it++))
{
- if (item->result_type() == INT_RESULT)
+ List_iterator_fast<Item> it(pc->fields);
+ f_info = pc->f_info;
+
+ Item *item;
+ while ((item = it++))
{
- // Check if fieldtype is ulonglong
- if (item->type() == Item::FIELD_ITEM &&
- ((Item_field*) item)->field->type() == FIELD_TYPE_LONGLONG &&
- ((Field_longlong*) ((Item_field*) item)->field)->unsigned_flag)
- *f_info++ = new field_ulonglong(item, pc);
- else
- *f_info++ = new field_longlong(item, pc);
+ if (item->result_type() == INT_RESULT)
+ {
+ // Check if fieldtype is ulonglong
+ if (item->type() == Item::FIELD_ITEM &&
+ ((Item_field*) item)->field->type() == FIELD_TYPE_LONGLONG &&
+ ((Field_longlong*) ((Item_field*) item)->field)->unsigned_flag)
+ *f_info++ = new field_ulonglong(item, pc);
+ else
+ *f_info++ = new field_longlong(item, pc);
+ }
+ if (item->result_type() == REAL_RESULT)
+ *f_info++ = new field_real(item, pc);
+ if (item->result_type() == STRING_RESULT)
+ *f_info++ = new field_str(item, pc);
}
- if (item->result_type() == REAL_RESULT)
- *f_info++ = new field_real(item, pc);
- if (item->result_type() == STRING_RESULT)
- *f_info++ = new field_str(item, pc);
}
DBUG_RETURN(pc);
+err:
+ delete pc;
+ DBUG_RETURN(0);
}
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index fc41643e8d4..3fb2fac5b27 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -261,13 +261,19 @@ void free_io_cache(TABLE *table)
DBUG_VOID_RETURN;
}
- /* Close all tables which aren't in use by any thread */
+/*
+ Close all tables which aren't in use by any thread
+
+ THD can be NULL, but then if_wait_for_refresh must be FALSE
+ and tables must be NULL.
+*/
bool close_cached_tables(THD *thd, bool if_wait_for_refresh,
TABLE_LIST *tables)
{
bool result=0;
DBUG_ENTER("close_cached_tables");
+ DBUG_ASSERT(thd || (!if_wait_for_refresh && !tables));
VOID(pthread_mutex_lock(&LOCK_open));
if (!tables)
@@ -343,7 +349,6 @@ bool close_cached_tables(THD *thd, bool if_wait_for_refresh,
VOID(pthread_mutex_unlock(&LOCK_open));
if (if_wait_for_refresh)
{
- THD *thd=current_thd;
pthread_mutex_lock(&thd->mysys_var->mutex);
thd->mysys_var->current_mutex= 0;
thd->mysys_var->current_cond= 0;
@@ -2401,11 +2406,7 @@ find_field_in_tables(THD *thd, Item_ident *item, TABLE_LIST *tables,
strxnmov(buff,sizeof(buff)-1,db,".",table_name,NullS);
table_name=buff;
}
- if (report_error == REPORT_ALL_ERRORS ||
- report_error == REPORT_EXCEPT_NON_UNIQUE)
- my_error(ER_UNKNOWN_TABLE, MYF(0), table_name, thd->where);
- else
- return (Field*) not_found_field;
+ my_error(ER_UNKNOWN_TABLE, MYF(0), table_name, thd->where);
}
else
if (report_error == REPORT_ALL_ERRORS ||
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index f4345f8ce28..c08d3eae0e1 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -1164,12 +1164,12 @@ void Query_cache::invalidate(THD *thd, TABLE_LIST *tables_used,
DBUG_ASSERT(!using_transactions || tables_used->table!=0);
if (tables_used->derived)
continue;
- if (using_transactions &&
- (tables_used->table->file->table_cache_type() ==
+ if (using_transactions &&
+ (tables_used->table->file->table_cache_type() ==
HA_CACHE_TBL_TRANSACT))
- /*
+ /*
Tables_used->table can't be 0 in transaction.
- Only 'drop' invalidate not opened table, but 'drop'
+ Only 'drop' invalidate not opened table, but 'drop'
force transaction finish.
*/
thd->add_changed_table(tables_used->table);
@@ -1217,7 +1217,7 @@ void Query_cache::invalidate(CHANGED_TABLE_LIST *tables_used)
*/
void Query_cache::invalidate_locked_for_write(TABLE_LIST *tables_used)
{
- DBUG_ENTER("Query_cache::invalidate (changed table list)");
+ DBUG_ENTER("Query_cache::invalidate_locked_for_write");
if (query_cache_size > 0 && tables_used)
{
STRUCT_LOCK(&structure_guard_mutex);
diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index 26929ebc432..cbd4f9049d3 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -227,7 +227,7 @@ void del_dbopt(const char *path)
}
-/*
+/*
Create database options file:
DESCRIPTION
@@ -246,10 +246,10 @@ static bool write_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create)
if (!create->default_table_charset)
create->default_table_charset= thd->variables.collation_server;
-
+
if (put_dbopt(path, create))
return 1;
-
+
if ((file=my_create(path, CREATE_MODE,O_RDWR | O_TRUNC,MYF(MY_WME))) >= 0)
{
ulong length;
@@ -531,21 +531,21 @@ bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info)
if ((error=write_db_opt(thd, path, create_info)))
goto exit;
- /*
+ /*
Change options if current database is being altered
TODO: Delete this code
*/
if (thd->db && !strcmp(thd->db,db))
{
- thd->db_charset= (create_info && create_info->default_table_charset) ?
- create_info->default_table_charset :
+ thd->db_charset= create_info->default_table_charset ?
+ create_info->default_table_charset :
thd->variables.collation_server;
thd->variables.collation_database= thd->db_charset;
}
if (mysql_bin_log.is_open())
{
- Query_log_event qinfo(thd, thd->query, thd->query_length, 0,
+ Query_log_event qinfo(thd, thd->query, thd->query_length, 0,
/* suppress_use */ TRUE);
/*
@@ -627,12 +627,12 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
pthread_mutex_lock(&LOCK_open);
remove_db_from_cache(db);
pthread_mutex_unlock(&LOCK_open);
-
+
error= -1;
if ((deleted= mysql_rm_known_files(thd, dirp, db, path, 0)) >= 0)
{
ha_drop_database(path);
- query_cache_invalidate1(db);
+ query_cache_invalidate1(db);
error = 0;
}
}
@@ -643,7 +643,7 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
my_casedn_str(files_charset_info, tmp_db);
db= tmp_db;
}
- if (!silent && deleted>=0 && thd)
+ if (!silent && deleted>=0)
{
const char *query;
ulong query_length;
@@ -693,7 +693,7 @@ exit:
have 'if (data_buf) free(data_buf)' data_buf is !=0 so this makes a
DOUBLE free().
Side effects of this double free() are, randomly (depends on the machine),
- when the slave is replicating a DROP DATABASE:
+ when the slave is replicating a DROP DATABASE:
- garbage characters in the error message:
"Error 'Can't drop database 'test2'; database doesn't exist' on query
'h4zI©'"
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 2f6e74225fd..43e82ff57c9 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -1603,9 +1603,6 @@ void st_select_lex::print_limit(THD *thd, String *str)
return;
}
- if (!thd)
- thd= current_thd;
-
if (explicit_limit)
{
str->append(" limit ", 7);
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 9f912ff37c5..4bd6acce499 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -897,14 +897,16 @@ static int check_connection(THD *thd)
char *user= end;
char *passwd= strend(user)+1;
char *db= passwd;
- char db_buff[NAME_LEN+1]; // buffer to store db in utf8
+ char db_buff[NAME_LEN+1]; // buffer to store db in utf8
char user_buff[USERNAME_LENGTH+1]; // buffer to store user in utf8
- /*
+ uint dummy_errors;
+
+ /*
Old clients send null-terminated string as password; new clients send
the size (1 byte) + string (not null-terminated). Hence in case of empty
password both send '\0'.
*/
- uint passwd_len= thd->client_capabilities & CLIENT_SECURE_CONNECTION ?
+ uint passwd_len= thd->client_capabilities & CLIENT_SECURE_CONNECTION ?
*passwd++ : strlen(passwd);
db= thd->client_capabilities & CLIENT_CONNECT_WITH_DB ?
db + passwd_len + 1 : 0;
@@ -912,7 +914,6 @@ static int check_connection(THD *thd)
/* Since 4.1 all database names are stored in utf8 */
if (db)
{
- uint dummy_errors;
db_buff[copy_and_convert(db_buff, sizeof(db_buff)-1,
system_charset_info,
db, strlen(db),
@@ -920,14 +921,10 @@ static int check_connection(THD *thd)
db= db_buff;
}
- if (user)
- {
- uint dummy_errors;
- user_buff[copy_and_convert(user_buff, sizeof(user_buff)-1,
- system_charset_info, user, strlen(user),
- thd->charset(), &dummy_errors)]= '\0';
- user= user_buff;
- }
+ user_buff[copy_and_convert(user_buff, sizeof(user_buff)-1,
+ system_charset_info, user, strlen(user),
+ thd->charset(), &dummy_errors)]= '\0';
+ user= user_buff;
if (thd->user)
x_free(thd->user);
@@ -3349,12 +3346,12 @@ unsent_create_error:
/*
If in a slave thread :
ALTER DATABASE DB may not be preceded by USE DB.
- For that reason, maybe db_ok() in sql/slave.cc did not check the
+ For that reason, maybe db_ok() in sql/slave.cc did not check the
do_db/ignore_db. And as this query involves no tables, tables_ok()
above was not called. So we have to check rules again here.
*/
#ifdef HAVE_REPLICATION
- if (thd->slave_thread &&
+ if (thd->slave_thread &&
(!db_ok(db, replicate_do_db, replicate_ignore_db) ||
!db_ok_with_wild_table(db)))
{
@@ -3467,8 +3464,7 @@ unsent_create_error:
case SQLCOM_GRANT:
{
if (check_access(thd, lex->grant | lex->grant_tot_col | GRANT_ACL,
- ((first_table && first_table->db) ?
- first_table->db : select_lex->db),
+ first_table ? first_table->db : select_lex->db,
first_table ? &first_table->grant.privilege : 0,
first_table ? 0 : 1, 0))
goto error;
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 5f8e6cf1f5a..9b2fb4a9c6a 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1977,10 +1977,10 @@ static bool mysql_admin_table(THD* thd, TABLE_LIST* tables,
for (table= tables; table; table= table->next_local)
{
char table_name[NAME_LEN*2+2];
- char* db = (table->db) ? table->db : thd->db;
+ char* db = table->db;
bool fatal_error=0;
- strxmov(table_name,db ? db : "",".",table->table_name,NullS);
+ strxmov(table_name, db, ".", table->table_name, NullS);
thd->open_options|= extra_open_options;
table->lock_type= lock_type;
/* open only one table from local list of command */
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index d2220cd67c3..f9ad513ea6a 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -120,7 +120,7 @@ int mysql_update(THD *thd,
bool used_key_is_modified, transactional_table, log_delayed;
int res;
int error=0;
- uint used_index;
+ uint used_index= MAX_KEY;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
uint want_privilege;
#endif
@@ -134,7 +134,6 @@ int mysql_update(THD *thd,
SELECT_LEX *select_lex= &thd->lex->select_lex;
DBUG_ENTER("mysql_update");
- LINT_INIT(used_index);
LINT_INIT(timestamp_query_id);
if (open_tables(thd, table_list, &table_count))
@@ -273,7 +272,7 @@ int mysql_update(THD *thd,
matching rows before updating the table!
*/
table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
- if ( (used_index != MAX_KEY) && old_used_keys.is_set(used_index))
+ if (used_index < MAX_KEY && old_used_keys.is_set(used_index))
{
table->key_read=1;
table->file->extra(HA_EXTRA_KEYREAD);
diff --git a/sql/table.cc b/sql/table.cc
index a030da95db4..82ad32341c0 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -342,12 +342,14 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
VOID(my_seek(file,pos,MY_SEEK_SET,MYF(0)));
if (my_read(file,(byte*) head,288,MYF(MY_NABP)))
goto err;
+#ifdef HAVE_CRYPTED_FRM
if (crypted)
{
crypted->decode((char*) head+256,288-256);
if (sint2korr(head+284) != 0) // Should be 0
goto err; // Wrong password
}
+#endif
share->fields= uint2korr(head+258);
pos= uint2korr(head+260); /* Length of all screens */
@@ -375,12 +377,14 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
pos+ (uint) (n_length+int_length+com_length));
if (read_string(file,(gptr*) &disk_buff,read_length))
goto err; /* purecov: inspected */
+#ifdef HAVE_CRYPTED_FRM
if (crypted)
{
crypted->decode((char*) disk_buff,read_length);
delete crypted;
crypted=0;
}
+#endif
strpos= disk_buff+pos;
share->intervals= (TYPELIB*) (field_ptr+share->fields+1);
diff --git a/sql/tztime.cc b/sql/tztime.cc
index b9b9e4821c4..4b769aed40c 100644
--- a/sql/tztime.cc
+++ b/sql/tztime.cc
@@ -1861,7 +1861,7 @@ tz_load_from_open_tables(const String *tz_name, TABLE_LIST *tz_tables)
{
ttid= (uint)table->field[1]->val_int();
- if (ttid > TZ_MAX_TYPES)
+ if (ttid >= TZ_MAX_TYPES)
{
sql_print_error("Error while loading time zone description from "
"mysql.time_zone_transition_type table: too big "
diff --git a/tests/client_test.c b/tests/client_test.c
index 8be970aed29..3cbc9918d6c 100644
--- a/tests/client_test.c
+++ b/tests/client_test.c
@@ -11406,6 +11406,12 @@ static void test_bug5194()
if (bind == 0 || query == 0 || param_str == 0)
{
fprintf(stderr, "Can't allocate enough memory for query structs\n");
+ if (bind)
+ free(bind);
+ if (query)
+ free(query);
+ if (param_str)
+ free(param_str);
return;
}
View Lorry Controller Status