Commit 9b609302 authored by unknown's avatar unknown

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

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


storage/myisam/mi_packrec.c:
  Auto merged
mysql-test/t/disabled.def:
  Manual merge from 5.0
parents c20245d2 af34d357
...@@ -22,3 +22,4 @@ events_scheduling : Bug#29830 Test case 'events_scheduling' fails on Mac ...@@ -22,3 +22,4 @@ events_scheduling : Bug#29830 Test case 'events_scheduling' fails on Mac
lowercase_table3 : Bug#32667 lowercase_table3.test reports to error log lowercase_table3 : Bug#32667 lowercase_table3.test reports to error log
rpl_log : Bug#32653: rpl_log.test fails randomly rpl_log : Bug#32653: rpl_log.test fails randomly
rpl_view : Bug#32654: rpl_view.test fails randomly rpl_view : Bug#32654: rpl_view.test fails randomly
ndb_backup_print : Bug#32357: ndb_backup_print test fails sometimes in pushbuild
...@@ -564,7 +564,7 @@ static void fill_quick_table(uint16 *table, uint bits, uint max_bits, ...@@ -564,7 +564,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) (((uint) 1 << bits)); table < end; table++) for (end= table + ((my_ptrdiff_t) 1 << bits); table < end; table++)
{ {
*table= (uint16) value; *table= (uint16) value;
} }
......
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