Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
40092a79
Commit
40092a79
authored
16 years ago
by
mleich@five.local.lan
Browse files
Options
Browse Files
Download
Plain Diff
Merge five.local.lan:/work/trees/mysql-5.1-build-src-clean
into five.local.lan:/work/merge/mysql-5.1-build
parents
cf8e6655
7e78633f
Branches unavailable
Tags unavailable
No related merge requests found
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
client/mysqlbinlog.cc
client/mysqlbinlog.cc
+1
-1
include/my_time.h
include/my_time.h
+1
-1
sql-common/my_time.c
sql-common/my_time.c
+3
-3
sql/init.cc
sql/init.cc
+1
-1
sql/tztime.cc
sql/tztime.cc
+2
-2
No files found.
client/mysqlbinlog.cc
View file @
40092a79
...
...
@@ -1926,7 +1926,7 @@ int main(int argc, char** argv)
DBUG_ENTER
(
"main"
);
DBUG_PROCESS
(
argv
[
0
]);
init_time
();
// for time functions
my_
init_time
();
// for time functions
parse_args
(
&
argc
,
(
char
***
)
&
argv
);
defaults_argv
=
argv
;
...
...
This diff is collapsed.
Click to expand it.
include/my_time.h
View file @
40092a79
...
...
@@ -95,7 +95,7 @@ long calc_daynr(uint year,uint month,uint day);
uint
calc_days_in_year
(
uint
year
);
uint
year_2000_handling
(
uint
year
);
void
init_time
(
void
);
void
my_
init_time
(
void
);
/*
...
...
This diff is collapsed.
Click to expand it.
sql-common/my_time.c
View file @
40092a79
...
...
@@ -701,9 +701,9 @@ int check_time_range(struct st_mysql_time *my_time, int *warning)
Prepare offset of system time zone from UTC for my_system_gmt_sec() func.
SYNOPSIS
init_time()
my_
init_time()
*/
void
init_time
(
void
)
void
my_
init_time
(
void
)
{
time_t
seconds
;
struct
tm
*
l_time
,
tm_tmp
;
...
...
@@ -792,7 +792,7 @@ long calc_daynr(uint year,uint month,uint day)
NOTES
The idea is to cache the time zone offset from UTC (including daylight
saving time) for the next call to make things faster. But currently we
just calculate this offset during startup (by calling init_time()
just calculate this offset during startup (by calling
my_
init_time()
function) and use it all the time.
Time value provided should be legal time value (e.g. '2003-01-01 25:00:00'
is not allowed).
...
...
This diff is collapsed.
Click to expand it.
sql/init.cc
View file @
40092a79
...
...
@@ -35,7 +35,7 @@ void unireg_init(ulong options)
wild_many
=
'%'
;
wild_one
=
'_'
;
wild_prefix
=
'\\'
;
/* Change to sql syntax */
current_pid
=
(
ulong
)
getpid
();
/* Save for later ref */
init_time
();
/* Init time-functions (read zone) */
my_init_time
();
/* Init time-functions (read zone) */
#ifndef EMBEDDED_LIBRARY
my_abort_hook
=
unireg_abort
;
/* Abort with close of databases */
#endif
...
...
This diff is collapsed.
Click to expand it.
sql/tztime.cc
View file @
40092a79
...
...
@@ -1034,7 +1034,7 @@ class Time_zone_system : public Time_zone
return lowest possible my_time_t in case of ambiguity or if we
provide time corresponding to the time-gap.
You should call init_time() function before using this function.
You should call
my_
init_time() function before using this function.
RETURN VALUE
Corresponding my_time_t value or 0 in case of error
...
...
@@ -2663,7 +2663,7 @@ main(int argc, char **argv)
}
printf
(
"gmt_sec_to_TIME = localtime for time_t in [1000000000,1100000000) range
\n
"
);
init_time
();
my_
init_time
();
/*
Be careful here! my_system_gmt_sec doesn't fully handle unnormalized
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment