summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-07-30 11:48:56 +0200
committerunknown <serg@serg.mylan>2004-07-30 11:48:56 +0200
commited898c5676ef122999163ef271d66a2b9009d835 (patch)
treeb18df468eea37a42db9e039d0fc971d3a1c9f794
parent8e5a4f63bc67f2126deab95fda02f86a435d2fb2 (diff)
parentc9d97d6765b54f381fe8548136dbb3d44698dfcf (diff)
downloadmariadb-git-ed898c5676ef122999163ef271d66a2b9009d835.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
-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;