mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Temporary commit of 10.0-merge

Browse source
This commit is contained in:
Michael Widenius 2013-03-26 00:03:13 +02:00
commit 068c61978e
649 changed files with 90817 additions and 25330 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/rpl_utility.cc
View file

@ -779,7 +779,7 @@ table_def::compatible_with(THD *thd, Relay_log_info *rli,
/*
We only check the initial columns for the tables.
*/
uint const cols_to_check= min(table->s->fields, size());
uint const cols_to_check= MY_MIN(table->s->fields, size());
TABLE *tmp_table= NULL;
for (uint col= 0 ; col < cols_to_check ; ++col)