diff options
| author | unknown <gluh@eagle.(none)> | 2007-10-10 14:31:19 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-10-10 14:31:19 +0500 |
| commit | d20c3355a36de891b1f4b2b42c4884f5ca9b4219 (patch) | |
| tree | 239a3c07a2fecf0daa2794f4fdb2f82d1989e1b5 /libmysql | |
| parent | 711be53b1124db15e346a23bce294350ff339cd6 (diff) | |
| parent | 8c53b726d987fedaea3b47ed402cd0e22a9ec502 (diff) | |
| download | mariadb-git-d20c3355a36de891b1f4b2b42c4884f5ca9b4219.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
libmysql/libmysql.c:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 1c82a5152b4..eccb417d085 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -4355,6 +4355,7 @@ static my_bool setup_one_fetch_function(MYSQL_BIND *param, MYSQL_FIELD *field) case MYSQL_TYPE_STRING: case MYSQL_TYPE_DECIMAL: case MYSQL_TYPE_NEWDECIMAL: + case MYSQL_TYPE_NEWDATE: DBUG_ASSERT(param->buffer_length != 0); param->fetch_result= fetch_result_str; break; @@ -4427,6 +4428,7 @@ static my_bool setup_one_fetch_function(MYSQL_BIND *param, MYSQL_FIELD *field) case MYSQL_TYPE_VAR_STRING: case MYSQL_TYPE_STRING: case MYSQL_TYPE_BIT: + case MYSQL_TYPE_NEWDATE: param->skip_result= skip_result_string; break; default: |