diff options
| author | monty@work.mysql.com <> | 2001-09-04 01:04:32 +0200 |
|---|---|---|
| committer | monty@work.mysql.com <> | 2001-09-04 01:04:32 +0200 |
| commit | 81006dd2274404bd5f9904f04a91b471949ec197 (patch) | |
| tree | aaf42ebc12881df70581f25e72e0a95304a405ae /client | |
| parent | 279de0c67c3c07d2dafb94763966842d8160c242 (diff) | |
| parent | 55dd01cc1354cd04acfec421dc9e9d9e971d489f (diff) | |
| download | mariadb-git-81006dd2274404bd5f9904f04a91b471949ec197.tar.gz | |
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index b296d24290d..9d8e15a7942 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -37,7 +37,7 @@ ** Tõnu Samuel <tonu@please.do.not.remove.this.spam.ee> **/ -#define DUMP_VERSION "8.15" +#define DUMP_VERSION "8.16" #include <global.h> #include <my_sys.h> @@ -1060,7 +1060,12 @@ static void dumpTable(uint numFields, char *table) dynstr_append(&extended_row,"\'"); } else - dynstr_append(&extended_row,row[i]); + { + /* change any strings ("inf","nan",..) into NULL */ + char *ptr = row[i]; + dynstr_append(&extended_row, + (!isalpha(*ptr)) ? ptr : "NULL"); + } } else dynstr_append(&extended_row,"\'\'"); @@ -1080,7 +1085,11 @@ static void dumpTable(uint numFields, char *table) if (!IS_NUM_FIELD(field)) unescape(md_result_file, row[i], lengths[i]); else - fputs(row[i],md_result_file); + { + /* change any strings ("inf","nan",..) into NULL */ + char *ptr = row[i]; + fputs((!isalpha(*ptr)) ? ptr : "NULL", md_result_file); + } } else { |