3382 Mattias Jonsson 2011-03-18 [merge]
merge
modified:
sql/ha_partition.cc
3381 Georgi Kodinov 2011-03-18
Bug #11766854 addendum :
Fixed test suite failures when the auth plugin is not compiled in.
modified:
mysql-test/include/have_plugin_auth.inc
mysql-test/t/mysql_client_test-master.opt
mysql-test/t/mysql_client_test.test
=== modified file 'sql/ha_partition.cc'
--- a/sql/ha_partition.cc 2011-03-09 17:41:16 +0000
+++ b/sql/ha_partition.cc 2011-03-18 10:03:54 +0000
@@ -4448,7 +4448,8 @@ int ha_partition::index_read_idx_map(uch
break;
}
}
- m_last_part= part;
+ if (part <= m_part_spec.end_part)
+ m_last_part= part;
}
else
{
@@ -6391,7 +6392,14 @@ void ha_partition::print_error(int error
{
/* In case m_file has not been initialized, like in bug#42438 */
if (m_file)
+ {
+ if (m_last_part >= m_tot_parts)
+ {
+ DBUG_ASSERT(0);
+ m_last_part= 0;
+ }
m_file[m_last_part]->print_error(error, errflag);
+ }
else
handler::print_error(error, errflag);
}
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5 branch (mattias.jonsson:3381 to 3382) | Mattias Jonsson | 18 Mar |