mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  stella.local:/home2/mydev/mysql-5.1-axmrg
This commit is contained in:
istruewing@stella.local 2007-11-26 15:38:29 +01:00
commit c29088d275
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/t/disabled.def
View file

@ -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
rpl_log : Bug#32653: rpl_log.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

2
storage/myisam/mi_packrec.c
View file

@ -564,7 +564,7 @@ static void fill_quick_table(uint16 *table, uint bits, uint max_bits,
*/
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;
}