mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge work.mysql.com:/home/bk/mysql
into work.mysql.com:/home/bk/mysql-4.0 Docs/manual.texi: Auto merged client/mysqldump.c: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged myisam/mi_check.c: Auto merged sql/log_event.cc: Auto merged sql/sql_parse.cc: Auto merged
This commit is contained in:
@ -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
|
||||
{
|
||||
|
Reference in New Issue
Block a user