diff options
| author | unknown <serg@serg.mylan> | 2003-12-11 16:47:50 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2003-12-11 16:47:50 +0100 |
| commit | 22c12eaeb296b55d6121531bea44a97fb5297f04 (patch) | |
| tree | d47903951f7c39e0965b9fb9c8c39e758d6d873e /client | |
| parent | ba249c10c41f4dde9f9fe9dafa50a7cb30bc33fa (diff) | |
| download | mariadb-git-22c12eaeb296b55d6121531bea44a97fb5297f04.tar.gz | |
chk_del() should not check key delete-chain
make a test for -inf more portable (-Inf)
client/mysqldump.c:
make a test for -inf more portable (-Inf)
myisam/mi_check.c:
chk_del() should not check key delete-chain
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index b7a61845f7c..d8e63cd611a 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -179,7 +179,7 @@ static struct my_option my_long_options[] = {"single-transaction", OPT_TRANSACTION, "Dump all tables in single transaction to get consistent snapshot. Mutually exclusive with --lock-tables.", (gptr*) &opt_single_transaction, (gptr*) &opt_single_transaction, 0, GET_BOOL, NO_ARG, - 0, 0, 0, 0, 0, 0}, + 0, 0, 0, 0, 0, 0}, {"no-create-db", 'n', "'CREATE DATABASE /*!32312 IF NOT EXISTS*/ db_name;' will not be put in the output. The above line will be added otherwise, if --databases or --all-databases option was given.}", (gptr*) &opt_create_db, (gptr*) &opt_create_db, 0, GET_BOOL, NO_ARG, 0, 0, @@ -1072,7 +1072,7 @@ static void dumpTable(uint numFields, char *table) { /* change any strings ("inf", "-inf", "nan") into NULL */ char *ptr = row[i]; - if (isalpha(*ptr) || (*ptr == '-' && *(ptr+1) == 'i')) + if (isalpha(*ptr) || (*ptr == '-' && isalpha(ptr[1]))) dynstr_append(&extended_row, "NULL"); else { @@ -1118,7 +1118,7 @@ static void dumpTable(uint numFields, char *table) if (opt_xml) fprintf(md_result_file, "\t\t<field name=\"%s\">%s</field>\n", field->name,!isalpha(*ptr) ?ptr: "NULL"); - else if (isalpha(*ptr) || (*ptr == '-' && *(ptr+1) == 'i')) + else if (isalpha(*ptr) || (*ptr == '-' && isalpha(ptr[1]))) fputs("NULL", md_result_file); else { |