diff options
author | unknown <ingo@mysql.com> | 2005-09-23 17:27:07 +0200 |
---|---|---|
committer | unknown <ingo@mysql.com> | 2005-09-23 17:27:07 +0200 |
commit | 944db06bbb328288d5e9cfc85de86876895b8b62 (patch) | |
tree | 48baa8a8836b9aa39f3616c84580cec8a057ba32 /myisam/mi_dbug.c | |
parent | 79b79064fafc92b5b5fcb5402ad7b2bace2cdb77 (diff) | |
parent | 9c0d809270a1d74ec33711d94cd65930eab11579 (diff) | |
download | mariadb-git-944db06bbb328288d5e9cfc85de86876895b8b62.tar.gz |
Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000
myisam/mi_dbug.c:
Auto merged
myisam/mi_rkey.c:
Auto merged
myisam/mi_search.c:
Auto merged
myisam/myisamdef.h:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/merge.test:
Auto merged
Diffstat (limited to 'myisam/mi_dbug.c')
-rw-r--r-- | myisam/mi_dbug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/mi_dbug.c b/myisam/mi_dbug.c index e782d21afe7..ddc8a403a33 100644 --- a/myisam/mi_dbug.c +++ b/myisam/mi_dbug.c @@ -40,12 +40,12 @@ void _mi_print_key(FILE *stream, register HA_KEYSEG *keyseg, end= key+ keyseg->length; if (keyseg->flag & HA_NULL_PART) { - if (!*key) + /* A NULL value is encoded by a 1-byte flag. Zero means NULL. */ + if (! *(key++)) { fprintf(stream,"NULL"); continue; } - key++; } switch (keyseg->type) { |