diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-02-13 15:16:00 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-02-13 15:16:00 +0200 |
| commit | 802fe52548921c37833e09974e59cce09dd4ee70 (patch) | |
| tree | 7700da83ed6388999914b1d35e5e5463fa4574db /libmysql | |
| parent | efcf8b57c735faa7f05567400a8f1b480d49acf3 (diff) | |
| parent | 2d2f444da6ccf88dcb6b1da49ef547d9ab71d882 (diff) | |
| download | mariadb-git-802fe52548921c37833e09974e59cce09dd4ee70.tar.gz | |
merge
client/mysql.cc:
Auto merged
libmysql/libmysql.c:
I commited this change 2 weeks ago.
I am still waiting for approval to push.
Someone meanwhile pushed different commit, so this merge commit.
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/libmysql.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index fe435616532..29f23b4ecc5 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1200,9 +1200,12 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, field->flags|= NUM_FLAG; if (default_value && row->data[6]) { - field->def=strdup_root(alloc,(char*) row->data[8]); + field->def=strdup_root(alloc,(char*) row->data[6]); field->def_length= lengths[6]; } + else + field->def=0; + field->max_length= 0; } } #ifndef DELETE_SUPPORT_OF_4_0_PROTOCOL |