Commit d0854927 authored by Oran Agra's avatar Oran Agra
Browse files

Merge branch 'unstable' into 6.2

parents ec2d1807 b57d0eb4
...@@ -749,7 +749,7 @@ sds getAbsolutePath(char *filename) { ...@@ -749,7 +749,7 @@ sds getAbsolutePath(char *filename) {
* Gets the proper timezone in a more portable fashion * Gets the proper timezone in a more portable fashion
* i.e timezone variables are linux specific. * i.e timezone variables are linux specific.
*/ */
unsigned long getTimeZone(void) { long getTimeZone(void) {
#if defined(__linux__) || defined(__sun) #if defined(__linux__) || defined(__sun)
return timezone; return timezone;
#else #else
...@@ -758,7 +758,7 @@ unsigned long getTimeZone(void) { ...@@ -758,7 +758,7 @@ unsigned long getTimeZone(void) {
gettimeofday(&tv, &tz); gettimeofday(&tv, &tz);
return tz.tz_minuteswest * 60UL; return tz.tz_minuteswest * 60L;
#endif #endif
} }
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
start_server {tags {"repl"}} { start_server {tags {"repl network"}} {
start_server {} { start_server {} {
set master [srv -1 client] set master [srv -1 client]
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment