diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-01-31 01:06:50 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-01-31 01:06:50 +0300 |
| commit | 2b0f6b5ace4b455344dc25e400873d3d68c90090 (patch) | |
| tree | 64c1a58bb6f6f5516fbf930759b54e0081b98b90 /client | |
| parent | 22e0e72370ddbd95d0438b769ac5dda82b2c9b0a (diff) | |
| parent | d9e9a73e8f1355a24b27d64d56d555d045ee0b4c (diff) | |
| download | mariadb-git-2b0f6b5ace4b455344dc25e400873d3d68c90090.tar.gz | |
Manual merge from mysql-trunk-merge.
Conflicts:
- mysql-test/suite/rpl/r/rpl_binlog_grant.result
- mysql-test/suite/rpl/r/rpl_sp.result
- mysql-test/suite/rpl/t/rpl_binlog_grant.test
- sql/sql_parse.cc
- sql/sql_table.cc
- sql/sql_test.cc
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index c50f2de5e7d..3f4ce1ab0af 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -290,7 +290,7 @@ static struct my_option my_long_options[] = (uchar**) &opt_events, (uchar**) &opt_events, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0}, {"extended-insert", 'e', - "Allows utilization of the new, much faster INSERT syntax.", + "Use multiple-row INSERT syntax that include several VALUES lists.", (uchar**) &extended_insert, (uchar**) &extended_insert, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0}, {"fields-terminated-by", OPT_FTB, |