summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <guilhem@mysql.com>2004-07-30 10:12:02 +0200
committerunknown <guilhem@mysql.com>2004-07-30 10:12:02 +0200
commitcfe4c252ac7088784cb56beea9204e2d67dba958 (patch)
tree19a266b5a4c16ae6b4b452a55c24b4afc2603e6e
parent3f636aa3791742b2d6fea0cb49c9979eb3475bce (diff)
parentbe536c3a9e3282345ed8e3a256c9a8f02a8634a5 (diff)
downloadmariadb-git-cfe4c252ac7088784cb56beea9204e2d67dba958.tar.gz
Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1-1717
-rw-r--r--sql-common/my_time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c
index 24c19be47ba..df852ad8880 100644
--- a/sql-common/my_time.c
+++ b/sql-common/my_time.c
@@ -578,7 +578,7 @@ fractional:
void init_time(void)
{
time_t seconds;
- struct tm *l_time,tm_tmp;;
+ struct tm *l_time,tm_tmp;
MYSQL_TIME my_time;
bool not_used;