summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorDavi Arnaut <davi.arnaut@oracle.com>2010-11-16 07:45:07 -0200
committerDavi Arnaut <davi.arnaut@oracle.com>2010-11-16 07:45:07 -0200
commit2495e10c110c97960ebf313588781677d8d9c0ba (patch)
tree8bb3c24e83c5645c346086318667a4d0cdb7b6a2 /sql
parentb4b3c996af688aabb0001dbbf925084c46858fa7 (diff)
parent80246ac8b8d0d2db08feae2a643a3dc89f9022d6 (diff)
downloadmariadb-git-2495e10c110c97960ebf313588781677d8d9c0ba.tar.gz
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'sql')
-rw-r--r--sql/debug_sync.cc2
-rw-r--r--sql/handler.cc2
-rw-r--r--sql/slave.cc2
-rw-r--r--sql/sql_partition.cc4
4 files changed, 5 insertions, 5 deletions
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc
index 74e5b2c70f3..4f353597d6d 100644
--- a/sql/debug_sync.cc
+++ b/sql/debug_sync.cc
@@ -1691,7 +1691,7 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action)
if (action->execute)
{
- const char *old_proc_info;
+ const char *UNINIT_VAR(old_proc_info);
action->execute--;
diff --git a/sql/handler.cc b/sql/handler.cc
index eb060002f48..3552a53972d 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -4160,7 +4160,7 @@ int handler::read_multi_range_first(KEY_MULTI_RANGE **found_range_p,
*/
int handler::read_multi_range_next(KEY_MULTI_RANGE **found_range_p)
{
- int result;
+ int UNINIT_VAR(result);
DBUG_ENTER("handler::read_multi_range_next");
/* We should not be called after the last call returned EOF. */
diff --git a/sql/slave.cc b/sql/slave.cc
index ab8952069fb..9978b4cb0e2 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2513,7 +2513,7 @@ static int exec_relay_log_event(THD* thd, Relay_log_info* rli)
if (slave_trans_retries)
{
- int temp_err;
+ int UNINIT_VAR(temp_err);
if (exec_res && (temp_err= has_temporary_error(thd)))
{
const char *errmsg;
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 70b200bf3cd..cec047d11fc 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -7484,8 +7484,8 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info,
PARTITION_ITERATOR *part_iter)
{
Field *field= part_info->part_field_array[0];
- uint32 max_endpoint_val;
- get_endpoint_func get_endpoint;
+ uint32 UNINIT_VAR(max_endpoint_val);
+ get_endpoint_func UNINIT_VAR(get_endpoint);
bool can_match_multiple_values; /* is not '=' */
uint field_len= field->pack_length_in_rec();
DBUG_ENTER("get_part_iter_for_interval_via_mapping");