diff options
Diffstat (limited to 'libmysql/libmysql.c')
| -rw-r--r-- | libmysql/libmysql.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index f9ddf7fa665..3931d7947aa 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1599,13 +1599,8 @@ mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, ulong length) { if (mysql->server_status & SERVER_STATUS_NO_BACKSLASH_ESCAPES) - { return escape_quotes_for_mysql(mysql->charset, to, 0, from, length); - } - else - { - return escape_string_for_mysql(mysql->charset, to, 0, from, length); - } + return escape_string_for_mysql(mysql->charset, to, 0, from, length); } @@ -3585,7 +3580,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, case MYSQL_TYPE_TIMESTAMP: { MYSQL_TIME *tm= (MYSQL_TIME *)buffer; - (void) str_to_datetime(value, length, tm, 0, &err); + (void) str_to_datetime(value, length, tm, TIME_FUZZY_DATE, &err); *param->error= test(err) && (param->buffer_type == MYSQL_TYPE_DATE && tm->time_type != MYSQL_TIMESTAMP_DATE); break; @@ -3703,7 +3698,8 @@ static void fetch_long_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, case MYSQL_TYPE_DATETIME: { int error; - value= number_to_datetime(value, (MYSQL_TIME *) buffer, 1, &error); + value= number_to_datetime(value, (MYSQL_TIME *) buffer, TIME_FUZZY_DATE, + &error); *param->error= test(error); break; } |