5.3 merge

This commit is contained in:
Sergei Golubchik 2012-08-27 18:13:17 +02:00
commit 9a64d0794c
24 changed files with 261 additions and 273 deletions

View file

@ -4159,7 +4159,6 @@ bool LEX::is_partition_management() const
alter_info.flags == ALTER_REORGANIZE_PARTITION));
}
#ifdef MYSQL_SERVER
uint binlog_unsafe_map[256];