diff options
| author | unknown <ingo@mysql.com> | 2005-09-23 10:49:08 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-09-23 10:49:08 +0200 |
| commit | c08721e5fa8e67a2aad8725d4eb9cca43062b445 (patch) | |
| tree | de63fb039c1b666c02ce35a3f1b10723072172d8 /myisam/mi_dbug.c | |
| parent | 727f0b8a1f2fdc3f458f6b5da5ebe3cc73620403 (diff) | |
| parent | 674c8165ea4b3430f397d84b0c79642de7b12ce4 (diff) | |
| download | mariadb-git-c08721e5fa8e67a2aad8725d4eb9cca43062b445.tar.gz | |
Merge mysql.com:/home/mydev/mysql-4.0-4000
into mysql.com:/home/mydev/mysql-4.1-4100
myisam/mi_dbug.c:
Auto merged
myisam/mi_rkey.c:
Auto merged
myisam/mi_search.c:
Auto merged
myisam/myisamdef.h:
Auto merged
myisammrg/myrg_rkey.c:
Bug#9112 - Merge table with composite index producing invalid results with some queries
Manual merge
mysql-test/r/merge.result:
Bug#9112 - Merge table with composite index producing invalid results with some queries
Manual merge
mysql-test/t/merge.test:
Bug#9112 - Merge table with composite index producing invalid results with some queries
Manual merge
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 02d1c7d05d6..34105c490e4 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) { |