summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-12-03 20:44:54 +0200
committerMichael Widenius <monty@askmonty.org>2011-12-03 20:44:54 +0200
commitef841d4c874b0635a07b6592356d575a555beeb5 (patch)
tree2ce7cacafa5e9406a103569bb6ce4c3648400def
parentc0311edfb90c96a2bf9db746fb0bbf1b1cee54e1 (diff)
downloadmariadb-git-ef841d4c874b0635a07b6592356d575a555beeb5.tar.gz
Fixed buildbot warnings
mysql-test/suite/maria/t/compat_aliases-master.opt: Fixed wrong limit storage/example/ha_example.cc: Fixed compiler warning
-rw-r--r--mysql-test/suite/maria/t/compat_aliases-master.opt2
-rw-r--r--storage/example/ha_example.cc3
2 files changed, 2 insertions, 3 deletions
diff --git a/mysql-test/suite/maria/t/compat_aliases-master.opt b/mysql-test/suite/maria/t/compat_aliases-master.opt
index 73f18586361..a1dcde828cd 100644
--- a/mysql-test/suite/maria/t/compat_aliases-master.opt
+++ b/mysql-test/suite/maria/t/compat_aliases-master.opt
@@ -1 +1 @@
---maria-max-sort-file-size=100M --aria-repair-threads=10000
+--maria-max-sort-file-size=100M --aria-repair-threads=100
diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc
index 8d5185ae0c7..013a92fc780 100644
--- a/storage/example/ha_example.cc
+++ b/storage/example/ha_example.cc
@@ -947,7 +947,6 @@ bool ha_example::check_if_incompatible_data(HA_CREATE_INFO *info,
uint table_changes)
{
ha_table_option_struct *param_old, *param_new;
- uint i;
DBUG_ENTER("ha_example::check_if_incompatible_data");
/*
This example shows how custom engine specific table and field
@@ -978,7 +977,7 @@ bool ha_example::check_if_incompatible_data(HA_CREATE_INFO *info,
DBUG_RETURN(COMPATIBLE_DATA_NO);
#ifndef DBUG_OFF
- for (i= 0; i < table->s->fields; i++)
+ for (uint i= 0; i < table->s->fields; i++)
{
ha_field_option_struct *f_old, *f_new;
f_old= table->s->field[i]->option_struct;