diff options
| author | unknown <grichter@bk-internal.mysql.com> | 2006-09-02 11:03:16 +0200 |
|---|---|---|
| committer | unknown <grichter@bk-internal.mysql.com> | 2006-09-02 11:03:16 +0200 |
| commit | 50456f81c431ec70d6f126534fb891b5e818cf12 (patch) | |
| tree | 1823c21585f5da58307333345b2b551e091405ed /client | |
| parent | 73ca6fc5ea1c0a389b8c7eb00f81179b40097b8d (diff) | |
| parent | 9c9a27d91a1528412e4d0c9dbfb022385f81575c (diff) | |
| download | mariadb-git-50456f81c431ec70d6f126534fb891b5e818cf12.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
into bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysql.cc | 9 | ||||
| -rw-r--r-- | client/mysqldump.c | 12 |
2 files changed, 15 insertions, 6 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index b39a05bc61c..2ba9e896747 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2354,9 +2354,14 @@ print_table_data(MYSQL_RES *result) (void) tee_fputs("|", PAGER); for (uint off=0; (field = mysql_fetch_field(result)) ; off++) { - tee_fprintf(PAGER, " %-*s |",(int) min(field->max_length, + uint name_length= (uint) strlen(field->name); + uint numcells= charset_info->cset->numcells(charset_info, + field->name, + field->name + name_length); + uint display_length= field->max_length + name_length - numcells; + tee_fprintf(PAGER, " %-*s |",(int) min(display_length, MAX_COLUMN_LENGTH), - field->name); + field->name); num_flag[off]= IS_NUM(field->type); not_null_flag[off]= IS_NOT_NULL(field->flags); } diff --git a/client/mysqldump.c b/client/mysqldump.c index 45aa2146d0f..d6f89022e32 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -850,8 +850,8 @@ static int get_options(int *argc, char ***argv) static void DB_error(MYSQL *mysql, const char *when) { DBUG_ENTER("DB_error"); - my_printf_error(0,"Got error: %d: %s %s", MYF(0), - mysql_errno(mysql), mysql_error(mysql), when); + fprintf(stderr, "%s: Got error: %d: %s %s\n", my_progname, + mysql_errno(mysql), mysql_error(mysql), when); safe_exit(EX_MYSQLERR); DBUG_VOID_RETURN; } /* DB_error */ @@ -879,8 +879,9 @@ static int mysql_query_with_error_report(MYSQL *mysql_con, MYSQL_RES **res, if (mysql_query(mysql_con, query) || (res && !((*res)= mysql_store_result(mysql_con)))) { - my_printf_error(0, "Couldn't execute '%s': %s (%d)", MYF(0), - query, mysql_error(mysql_con), mysql_errno(mysql_con)); + fprintf(stderr, "%s: Couldn't execute '%s': %s (%d)\n", + my_progname, query, + mysql_error(mysql_con), mysql_errno(mysql_con)); safe_exit(EX_MYSQLERR); return 1; } @@ -2234,7 +2235,10 @@ static void dump_table(char *table, char *db) check_io(md_result_file); } if (mysql_query_with_error_report(mysql, 0, query)) + { DB_error(mysql, "when retrieving data from server"); + goto err; + } if (quick) res=mysql_use_result(mysql); else |