diff options
author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-02-07 14:57:15 +0200 |
---|---|---|
committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-02-07 14:57:15 +0200 |
commit | 8b85498f3f8a0a9a42cf981baf16ac0372a90eb5 (patch) | |
tree | 44c305c0310e452c405a05a8813771f9b0401fdc /libmysql | |
parent | dfb188898487e2407910b5e84bb4ef2de0ecf218 (diff) | |
parent | 9503614aab9c2e151bb69675e172edf7c499fa0e (diff) | |
download | mariadb-git-8b85498f3f8a0a9a42cf981baf16ac0372a90eb5.tar.gz |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
libmysql/libmysql.c:
Auto merged
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/libmysql.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index bb40d757166..e4966a392ba 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1173,7 +1173,7 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields, if (INTERNAL_NUM_FIELD(field)) 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]); else field->def=0; field->max_length= 0; |