diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-09 21:08:56 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-09 21:08:56 +0300 |
| commit | ef8eefb9e4ef76810b06ea835bc2f07cffbd361b (patch) | |
| tree | 8f547099445a7673d67da016f7a567772cd5552c /sql/time.cc | |
| parent | 16ee55991e99ce50fcfb5bb21efc09894847967e (diff) | |
| download | mariadb-git-ef8eefb9e4ef76810b06ea835bc2f07cffbd361b.tar.gz | |
Fixed INSERT DELAYED with Innobase
Fix for shutdown on NT
Fixed bug when using wrong dates from blob field.
BitKeeper/deleted/.del-df_crash.result~4a3dbee64843953d:
Delete: mysql-test/r/df_crash.result
BitKeeper/deleted/.del-df_crash.test~4c365178fe437f6:
Delete: mysql-test/t/df_crash.test
Docs/manual.texi:
Changelog
innobase/ib_config.h.in:
automatic changed file
innobase/ib_config.h:
automatic changed file
mysql-test/r/func_time.result:
Test case for bug in time functions
mysql-test/r/innobase.result:
Test for INSERT DELAYED
mysql-test/t/func_time.test:
Test case for bug in time functions
mysql-test/t/innobase.test:
Test for INSERT DELAYED
scripts/mysql_convert_table_format.sh:
Added --socket and --port
sql/ha_innobase.cc:
Fix bug when compiling with SAFE_MUTEX
Cleaner comment when using SHOW TABLE STATUS
sql/mysqld.cc:
Fix for shutdown on NT
sql/sql_insert.cc:
Fixed problem with Innobase and INSERT DELAYED
sql/sql_udf.cc:
Support for UDF on windows
sql/time.cc:
Fixed bug when using wrong dates from blob field.
strings/ctype-tis620.c:
Removed not used variable
support-files/mysql-max.spec.sh:
Removed old not used section
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql/time.cc')
| -rw-r--r-- | sql/time.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sql/time.cc b/sql/time.cc index b40047cb381..086977af72f 100644 --- a/sql/time.cc +++ b/sql/time.cc @@ -428,15 +428,11 @@ str_to_TIME(const char *str, uint length, TIME *l_time,bool fuzzy_date) uint field_length,year_length,digits,i,number_of_fields,date[7]; bool date_used=0; const char *pos; + const char *end=str+length; DBUG_ENTER("str_to_TIME"); DBUG_PRINT("enter",("str: %.*s",length,str)); - if(!str) - DBUG_RETURN(TIMESTAMP_NONE); - - const char *end=str+length; - - for (; !isdigit(*str) && str != end ; str++) ; // Skip garbage + for (; str != end && !isdigit(*str) ; str++) ; // Skipp garbage if (str == end) DBUG_RETURN(TIMESTAMP_NONE); /* @@ -562,7 +558,7 @@ bool str_to_time(const char *str,uint length,TIME *l_time) uint state; l_time->neg=0; - for (; !isdigit(*str) && *str != '-' && str != end ; str++) + for (; str != end && !isdigit(*str) && *str != '-' ; str++) length--; if (str != end && *str == '-') { |