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

into stella.local:/home2/mydev/mysql-5.0-axmrg

Merge stella.local:/home2/mydev/mysql-5.0-ateam
into stella.local:/home2/mydev/mysql-5.0-axmrg
1be2f0fa · unknown · 50f5ba45 · 7ae4cfaf · 1be2f0fa · 1be2f0fa
Commit 1be2f0fa authored Nov 23, 2007 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

myisam/mi_packrec.c myisam/mi_packrec.c +1 -1

mysql-test/t/disabled.def mysql-test/t/disabled.def +3 -0

No files found.
--- a/myisam/mi_packrec.c
+++ b/myisam/mi_packrec.c
@@ -563,7 +563,7 @@ static void fill_quick_table(uint16 *table, uint bits, uint max_bits,
  */
  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;
  }

--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -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_unset     : 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