diff options
| author | unknown <monty@mysql.com> | 2006-06-05 06:16:08 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2006-06-05 06:16:08 +0300 |
| commit | 6c3babe52c28d28a92d242307e13723500dce969 (patch) | |
| tree | 4be36749abc142ae1362b83f9053e569a7a98099 /sql/partition_info.cc | |
| parent | 555eb848f2aa3ac5eb09b251072930eb38cd8f7e (diff) | |
| download | mariadb-git-6c3babe52c28d28a92d242307e13723500dce969.tar.gz | |
After merge fixes
Remove compiler warnings
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Fixed regex to get rid of xid= in output
mysql-test/r/mysqlcheck.result:
Drop client_test_db if mysql_client_test fails
mysql-test/t/mysqlcheck.test:
Drop client_test_db if mysql_client_test fails
mysql-test/t/mysqldump.test:
Use --defaults-file instead of --defaults-extra-file to avoid reading my.cnf files
sql/event_scheduler.cc:
Remove compiler warnings
sql/ha_partition.cc:
Don't divide with 0 when checking current auto_increment value
sql/handler.cc:
After merge fix
sql/mysqld.cc:
Remove comiler warning
sql/partition_info.cc:
After merge fix
Fixed memory reference overrun for some wrong partition definitions
sql/sql_base.cc:
After merge fix
Always set *leaves in setup_tables_and_check_access() (assume argument is always given).
sql/sql_select.cc:
Simple optimization
sql/sql_show.cc:
Remove compiler warning
sql/sql_table.cc:
After merge fix
storage/csv/ha_tina.cc:
Ensure table maps are restored properly
storage/ndb/include/ndbapi/Ndb.hpp:
Remove compiler warning
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index e5f8cd7ffac..edd8f56d8c4 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -635,8 +635,8 @@ bool partition_info::check_list_constants() &list_part_cmp); not_first= FALSE; - i= prev_value= 0; //prev_value initialised to quiet compiler - do + prev_value= 0; // prev_value initialised to quiet compiler + for (i= 0; i < no_list_values ; i++) { curr_value= list_array[i].list_value; if (likely(!not_first || prev_value != curr_value)) @@ -649,7 +649,7 @@ bool partition_info::check_list_constants() my_error(ER_MULTIPLE_DEF_CONST_IN_LIST_PART_ERROR, MYF(0)); goto end; } - } while (++i < no_list_values); + } result= FALSE; end: DBUG_RETURN(result); @@ -689,10 +689,10 @@ bool partition_info::check_partition_info(handlerton **eng_type, DBUG_ENTER("partition_info::check_partition_info"); if (part_type != HASH_PARTITION || !list_of_part_fields) - part_expr->walk(&Item::check_partition_func_processor, + part_expr->walk(&Item::check_partition_func_processor, 0, (byte*)(&part_expression_ok)); if (is_sub_partitioned() && !list_of_subpart_fields) - subpart_expr->walk(&Item::check_partition_func_processor, + subpart_expr->walk(&Item::check_partition_func_processor, 0, (byte*)(&part_expression_ok)); if (!part_expression_ok) { |