5.2 merge

This commit is contained in:
Sergei Golubchik 2012-05-20 14:57:29 +02:00
commit 7f6f53a8df
117 changed files with 2796 additions and 340 deletions

View file

@ -143,7 +143,8 @@ static my_bool opt_compress= FALSE, tty_password= FALSE,
const char *auto_generate_sql_type= "mixed";
static unsigned long connect_flags= CLIENT_MULTI_RESULTS |
CLIENT_MULTI_STATEMENTS;
CLIENT_MULTI_STATEMENTS |
CLIENT_REMEMBER_OPTIONS;
static int verbose, delimiter_length;
static uint commit_rate;