summaryrefslogtreecommitdiff
path: root/sql-common/my_time.c
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2005-01-04 17:21:55 +0100
committerunknown <joerg@mysql.com>2005-01-04 17:21:55 +0100
commitf61ecc4301c246efd1917ec5658af898e1d6994f (patch)
treee807dd2b8948f1981cb20f8d6480184fbdf64133 /sql-common/my_time.c
parent592ffbcd68337c40dd75f2e052ee0479a120f8bd (diff)
downloadmariadb-git-f61ecc4301c246efd1917ec5658af898e1d6994f.tar.gz
Changed C++ style comments to C style, bug#7665.
Diffstat (limited to 'sql-common/my_time.c')
-rw-r--r--sql-common/my_time.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql-common/my_time.c b/sql-common/my_time.c
index c67ce1d3f85..1078259f15d 100644
--- a/sql-common/my_time.c
+++ b/sql-common/my_time.c
@@ -910,14 +910,14 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
goto err;
if (nr <= (YY_PART_YEAR-1)*10000L+1231L)
{
- nr= (nr+20000000L)*1000000L; // YYMMDD, year: 2000-2069
+ nr= (nr+20000000L)*1000000L; /* YYMMDD, year: 2000-2069 */
goto ok;
}
if (nr < (YY_PART_YEAR)*10000L+101L)
goto err;
if (nr <= 991231L)
{
- nr= (nr+19000000L)*1000000L; // YYMMDD, year: 1970-1999
+ nr= (nr+19000000L)*1000000L; /* YYMMDD, year: 1970-1999 */
goto ok;
}
if (nr < 10000101L)
@@ -931,13 +931,13 @@ longlong number_to_datetime(longlong nr, MYSQL_TIME *time_res,
goto err;
if (nr <= (YY_PART_YEAR-1)*LL(10000000000)+LL(1231235959))
{
- nr= nr+LL(20000000000000); // YYMMDDHHMMSS, 2000-2069
+ nr= nr+LL(20000000000000); /* YYMMDDHHMMSS, 2000-2069 */
goto ok;
}
if (nr < YY_PART_YEAR*LL(10000000000)+ LL(101000000))
goto err;
if (nr <= LL(991231235959))
- nr= nr+LL(19000000000000); // YYMMDDHHMMSS, 1970-1999
+ nr= nr+LL(19000000000000); /* YYMMDDHHMMSS, 1970-1999 */
ok:
part1=(long) (nr/LL(1000000));