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
e3b33842
Commit
e3b33842
authored
May 11, 2021
by
Nikita Malyavin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tztime_to_sql: quote `Offset` field
parent
982290fe
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
mysql-test/main/mysql_tzinfo_to_sql_symlink.result
mysql-test/main/mysql_tzinfo_to_sql_symlink.result
+5
-5
sql/tztime.cc
sql/tztime.cc
+1
-1
No files found.
mysql-test/main/mysql_tzinfo_to_sql_symlink.result
View file @
e3b33842
...
@@ -19,7 +19,7 @@ START TRANSACTION;
...
@@ -19,7 +19,7 @@ START TRANSACTION;
INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
SET @time_zone_id= LAST_INSERT_ID();
SET @time_zone_id= LAST_INSERT_ID();
INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('GMT', @time_zone_id);
INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('GMT', @time_zone_id);
INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id,
Offset
, Is_DST, Abbreviation) VALUES
INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id,
`Offset`
, Is_DST, Abbreviation) VALUES
(@time_zone_id, 0, 0, 0, 'GMT')
(@time_zone_id, 0, 0, 0, 'GMT')
;
;
Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/garbage' as time zone. Skipping it.
Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/garbage' as time zone. Skipping it.
...
@@ -27,7 +27,7 @@ Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/ignored.tab' as time zone. Sk
...
@@ -27,7 +27,7 @@ Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/ignored.tab' as time zone. Sk
INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
SET @time_zone_id= LAST_INSERT_ID();
SET @time_zone_id= LAST_INSERT_ID();
INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('posix/GMT', @time_zone_id);
INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('posix/GMT', @time_zone_id);
INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id,
Offset
, Is_DST, Abbreviation) VALUES
INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id,
`Offset`
, Is_DST, Abbreviation) VALUES
(@time_zone_id, 0, 0, 0, 'GMT')
(@time_zone_id, 0, 0, 0, 'GMT')
;
;
Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/garbage' as time zone. Skipping it.
Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/garbage' as time zone. Skipping it.
...
@@ -63,14 +63,14 @@ START TRANSACTION;
...
@@ -63,14 +63,14 @@ START TRANSACTION;
INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
SET @time_zone_id= LAST_INSERT_ID();
SET @time_zone_id= LAST_INSERT_ID();
INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('GMT', @time_zone_id);
INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('GMT', @time_zone_id);
INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id,
Offset
, Is_DST, Abbreviation) VALUES
INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id,
`Offset`
, Is_DST, Abbreviation) VALUES
(@time_zone_id, 0, 0, 0, 'GMT')
(@time_zone_id, 0, 0, 0, 'GMT')
;
;
Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/garbage' as time zone. Skipping it.
Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/garbage' as time zone. Skipping it.
INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
SET @time_zone_id= LAST_INSERT_ID();
SET @time_zone_id= LAST_INSERT_ID();
INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('posix/GMT', @time_zone_id);
INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('posix/GMT', @time_zone_id);
INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id,
Offset
, Is_DST, Abbreviation) VALUES
INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id,
`Offset`
, Is_DST, Abbreviation) VALUES
(@time_zone_id, 0, 0, 0, 'GMT')
(@time_zone_id, 0, 0, 0, 'GMT')
;
;
Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/garbage' as time zone. Skipping it.
Warning: Unable to load 'MYSQLTEST_VARDIR/zoneinfo/posix/garbage' as time zone. Skipping it.
...
@@ -101,7 +101,7 @@ END IF|
...
@@ -101,7 +101,7 @@ END IF|
INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
INSERT INTO time_zone (Use_leap_seconds) VALUES ('N');
SET @time_zone_id= LAST_INSERT_ID();
SET @time_zone_id= LAST_INSERT_ID();
INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('XXX', @time_zone_id);
INSERT INTO time_zone_name (Name, Time_zone_id) VALUES ('XXX', @time_zone_id);
INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id,
Offset
, Is_DST, Abbreviation) VALUES
INSERT INTO time_zone_transition_type (Time_zone_id, Transition_type_id,
`Offset`
, Is_DST, Abbreviation) VALUES
(@time_zone_id, 0, 0, 0, 'GMT')
(@time_zone_id, 0, 0, 0, 'GMT')
;
;
\d |
\d |
...
...
sql/tztime.cc
View file @
e3b33842
...
@@ -2417,7 +2417,7 @@ print_tz_as_sql(const char* tz_name, const TIME_ZONE_INFO *sp)
...
@@ -2417,7 +2417,7 @@ print_tz_as_sql(const char* tz_name, const TIME_ZONE_INFO *sp)
}
}
printf
(
"INSERT INTO time_zone_transition_type \
printf
(
"INSERT INTO time_zone_transition_type \
(Time_zone_id, Transition_type_id,
Offset
, Is_DST, Abbreviation) VALUES
\n
"
);
(Time_zone_id, Transition_type_id,
`Offset`
, Is_DST, Abbreviation) VALUES
\n
"
);
for
(
i
=
0
;
i
<
sp
->
typecnt
;
i
++
)
for
(
i
=
0
;
i
<
sp
->
typecnt
;
i
++
)
printf
(
"%s(@time_zone_id, %u, %ld, %d, '%s')
\n
"
,
(
i
==
0
?
" "
:
","
),
i
,
printf
(
"%s(@time_zone_id, %u, %ld, %d, '%s')
\n
"
,
(
i
==
0
?
" "
:
","
),
i
,
...
...
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