Merge 10.0-base -> 10.0.

Also fixed a bug in sql_update.cc: the code of mysql_update() lacked
a call of set_statistics_for_table().
This commit is contained in:
Igor Babaev 2013-01-10 22:33:23 -08:00
commit 1ef07d0845
156 changed files with 12024 additions and 1662 deletions

View file

@ -1936,7 +1936,9 @@ static void print_xml_row(FILE *xml_file, const char *row_name,
{
create_stmt_ptr= (*row)[i];
create_stmt_len= lengths[i];
#ifndef DBUG_OFF
body_found= 1;
#endif
}
else
{