diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-06 17:13:42 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-06 17:13:42 +0100 |
| commit | be65bc99170c3865922f9ad0199e9ff0903e6242 (patch) | |
| tree | ccd7ed37b88de38a47462ff2a6c95aec6ad8bc08 /client | |
| parent | da0b03a9db77efa7d53555bd871d8f80d16a1fa9 (diff) | |
| parent | 19df110369d4cef5303176a8aedca34cd0e2d271 (diff) | |
| download | mariadb-git-be65bc99170c3865922f9ad0199e9ff0903e6242.tar.gz | |
merge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 5 | ||||
| -rw-r--r-- | client/mysqldump.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 726b06b02be..1a03034a30c 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3612,7 +3612,8 @@ print_table_data_vertically(MYSQL_RES *result) for (uint off=0; off < mysql_num_fields(result); off++) { field= mysql_fetch_field(result); - tee_fprintf(PAGER, "%*s: ",(int) max_length,field->name); + if (column_names) + tee_fprintf(PAGER, "%*s: ",(int) max_length,field->name); if (cur[off]) { unsigned int i; @@ -4282,7 +4283,7 @@ char *get_arg(char *line, my_bool get_next_arg) if (*ptr == '\\' && ptr[1]) // escaped character { // Remove the backslash - strmov(ptr, ptr+1); + strmov_overlapp(ptr, ptr+1); } else if ((!quoted && *ptr == ' ') || (quoted && *ptr == qtype)) { diff --git a/client/mysqldump.c b/client/mysqldump.c index 9c665e6d76a..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, @@ -840,7 +840,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), &err_ptr, &err_len); if (err_len) { - strmake(buff, err_ptr, min(sizeof(buff), err_len)); + strmake(buff, err_ptr, min(sizeof(buff) - 1, err_len)); fprintf(stderr, "Invalid mode to --compatible: %s\n", buff); exit(1); } @@ -4630,7 +4630,7 @@ static ulong find_set(TYPELIB *lib, const char *x, uint length, for (; pos != end && *pos != ','; pos++) ; var_len= (uint) (pos - start); - strmake(buff, start, min(sizeof(buff), var_len)); + strmake(buff, start, min(sizeof(buff) - 1, var_len)); find= find_type(buff, lib, var_len); if (!find) { |