1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed MDEV-612, LP:1010759 - Valgrind error ha_maria::check_if_incompatible_data on

Browse Source 
mysql-test/r/partition.result:
  Added test case
mysql-test/t/partition.test:
  Added test case
sql/ha_partition.cc:
  Removed printing of not initialized variable
storage/maria/ha_maria.cc:
  Don't copy variables that are not initialized
This commit is contained in:
Michael Widenius 2012-10-31 23:49:51 +02:00
parent b7ae1194e2
commit fb90c36284
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/partition.result
View File

@ -2246,4 +2246,10 @@ HAVING b > geomfromtext("")
); );
1 1
DROP TABLE t1; DROP TABLE t1;
MDEV-612 Valgrind error in ha_maria::check_if_incompatible_data
CREATE TABLE t1 (a INT, b INT, KEY(a)) ENGINE=Aria PARTITION BY KEY(a) PARTITIONS 2;
ALTER TABLE t1 ADD KEY (b);
drop table t1;
End of 5.1 tests End of 5.1 tests

8
mysql-test/t/partition.test
View File

@ -2267,4 +2267,12 @@ SELECT 1 FROM t1 WHERE b < SOME
DROP TABLE t1; DROP TABLE t1;
--echo
--echo MDEV-612 Valgrind error in ha_maria::check_if_incompatible_data
--echo
CREATE TABLE t1 (a INT, b INT, KEY(a)) ENGINE=Aria PARTITION BY KEY(a) PARTITIONS 2;
ALTER TABLE t1 ADD KEY (b);
drop table t1;
--echo End of 5.1 tests --echo End of 5.1 tests

4
sql/ha_partition.cc
View File

@ -4347,8 +4347,8 @@ int ha_partition::common_index_read(uchar *buf, bool have_start_key)
DBUG_ENTER("ha_partition::common_index_read"); DBUG_ENTER("ha_partition::common_index_read");
LINT_INIT(key_len); /* used if have_start_key==TRUE */ LINT_INIT(key_len); /* used if have_start_key==TRUE */
DBUG_PRINT("info", ("m_ordered %u m_ordered_scan_ong %u have_start_key %u", DBUG_PRINT("info", ("m_ordered: %u have_start_key: %u",
m_ordered, m_ordered_scan_ongoing, have_start_key)); m_ordered, have_start_key));
if (have_start_key) if (have_start_key)
{ {

7
storage/maria/ha_maria.cc
View File

@ -2343,9 +2343,10 @@ int ha_maria::info(uint flag, my_bool lock_table_share)
errkey= maria_info.errkey; errkey= maria_info.errkey;
my_store_ptr(dup_ref, ref_length, maria_info.dup_key_pos); my_store_ptr(dup_ref, ref_length, maria_info.dup_key_pos);
} }
/* Faster to always update, than to do it based on flag */ if (flag & HA_STATUS_TIME)
stats.update_time= maria_info.update_time; stats.update_time= maria_info.update_time;
stats.auto_increment_value= maria_info.auto_increment; if (flag & HA_STATUS_AUTO)
stats.auto_increment_value= maria_info.auto_increment;
return 0; return 0;
} }