Commit a1c5fef4 authored by istruewing@stella.local's avatar istruewing@stella.local

Merge stella.local:/home2/mydev/mysql-5.0-ateam

into  stella.local:/home2/mydev/mysql-5.0-axmrg
parents a13b5e9d 3b09d370
...@@ -563,7 +563,7 @@ static void fill_quick_table(uint16 *table, uint bits, uint max_bits, ...@@ -563,7 +563,7 @@ static void fill_quick_table(uint16 *table, uint bits, uint max_bits,
*/ */
value|= (max_bits - bits) << 8 | IS_CHAR; value|= (max_bits - bits) << 8 | IS_CHAR;
for (end= table + ((uint) 1 << bits); table < end; table++) for (end= table + (uint) (((uint) 1 << bits)); table < end; table++)
{ {
*table= (uint16) value; *table= (uint16) value;
} }
......
...@@ -16,3 +16,6 @@ im_daemon_life_cycle : Bug#20294: Instance manager tests fail randomly ...@@ -16,3 +16,6 @@ im_daemon_life_cycle : Bug#20294: Instance manager tests fail randomly
im_options_set : Bug#20294: Instance manager tests fail randomly im_options_set : Bug#20294: Instance manager tests fail randomly
im_options_unset : Bug#20294: Instance manager tests fail randomly im_options_unset : Bug#20294: Instance manager tests fail randomly
im_utils : Bug#20294: Instance manager tests fail randomly im_utils : Bug#20294: Instance manager tests fail randomly
grant_cache : Bug#32651: grant_cache.test fails
rpl_log : Bug#32653: rpl_log.test fails randomly
rpl_view : Bug#32654: rpl_view.test fails randomly
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment