diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 13 | ||||
| -rw-r--r-- | client/mysqltest.c | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 2defee27c7e..b15673b4bb4 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -1546,12 +1546,13 @@ static void dumpTable(uint numFields, char *table) we'll dump in hex only BLOB columns. */ is_blob= (opt_hex_blob && field->charsetnr == 63 && - (field->type == FIELD_TYPE_STRING || - field->type == FIELD_TYPE_VAR_STRING || - field->type == FIELD_TYPE_BLOB || - field->type == FIELD_TYPE_LONG_BLOB || - field->type == FIELD_TYPE_MEDIUM_BLOB || - field->type == FIELD_TYPE_TINY_BLOB)) ? 1 : 0; + (field->type == MYSQL_TYPE_STRING || + field->type == MYSQL_TYPE_VAR_STRING || + field->type == MYSQL_TYPE_VARCHAR || + field->type == MYSQL_TYPE_BLOB || + field->type == MYSQL_TYPE_LONG_BLOB || + field->type == MYSQL_TYPE_MEDIUM_BLOB || + field->type == MYSQL_TYPE_TINY_BLOB)) ? 1 : 0; if (extended_insert) { ulong length = lengths[i]; diff --git a/client/mysqltest.c b/client/mysqltest.c index ee28ca00a31..1c2b109e481 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -778,7 +778,7 @@ int var_set(const char *var_name, const char *var_name_end, } else v = var_reg + digit; - return eval_expr(v, var_val, (const char**)&var_val_end); + DBUG_RETURN(eval_expr(v, var_val, (const char**)&var_val_end)); } |