merge with 5.1-micro

This commit is contained in:
Sergei Golubchik 2011-06-07 18:13:02 +02:00
commit 9b98cae4cc
84 changed files with 1754 additions and 1556 deletions

View file

@ -168,7 +168,7 @@ field_store_time_t(
my_time.time_type = MYSQL_TIMESTAMP_DATETIME;
#endif
return(field->store_time(&my_time, MYSQL_TIMESTAMP_DATETIME));
return(field->store_time(&my_time));
}
/*******************************************************************//**