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
3dd03a23
Commit
3dd03a23
authored
Sep 02, 2022
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-29347 MariaDB 10.6.8 fails to start when ONLY_FULL_GROUP_BY gets provided
parent
673243c8
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
11 deletions
+52
-11
mysql-test/main/mysql_tzinfo_to_sql_symlink.result
mysql-test/main/mysql_tzinfo_to_sql_symlink.result
+33
-10
mysql-test/main/mysql_tzinfo_to_sql_symlink.test
mysql-test/main/mysql_tzinfo_to_sql_symlink.test
+17
-0
sql/tztime.cc
sql/tztime.cc
+2
-1
No files found.
mysql-test/main/mysql_tzinfo_to_sql_symlink.result
View file @
3dd03a23
This diff is collapsed.
Click to expand it.
mysql-test/main/mysql_tzinfo_to_sql_symlink.test
View file @
3dd03a23
...
...
@@ -214,6 +214,23 @@ SELECT g.VARIABLE_NAME, g.VARIABLE_VALUE - b.VARIABLE_VALUE AS diff
--
echo
# End of 10.2 tests
--
echo
#
--
echo
#
--
echo
# MDEV-29347 MariaDB 10.6.8 fails to start when ONLY_FULL_GROUP_BY gets provided
--
echo
#
--
exec
$MYSQL_TZINFO_TO_SQL
$MYSQLTEST_VARDIR
/
zoneinfo
>
$MYSQL_TMP_DIR
/
tz
.
sql
set
sql_mode
=
only_full_group_by
;
--
disable_query_log
--
source
$MYSQL_TMP_DIR
/
tz
.
sql
--
enable_query_log
SELECT
COUNT
(
*
)
FROM
time_zone
;
SELECT
COUNT
(
*
)
FROM
time_zone_name
;
SELECT
COUNT
(
*
)
FROM
time_zone_transition
;
SELECT
COUNT
(
*
)
FROM
time_zone_transition_type
;
SELECT
COUNT
(
*
)
FROM
time_zone_leap_second
;
select
@@
sql_mode
;
set
sql_mode
=
default
;
--
echo
#
--
echo
# MDEV-6236 - [PATCH] mysql_tzinfo_to_sql may produce invalid SQL
--
echo
#
...
...
sql/tztime.cc
View file @
3dd03a23
...
...
@@ -2764,7 +2764,8 @@ main(int argc, char **argv)
trunc_tables
=
trunc_tables_const
;
printf
(
"set @wsrep_is_on=(%s);
\n
"
,
wsrep_is_on
);
printf
(
"SELECT concat('%%', GROUP_CONCAT(OPTION), '%%') INTO @replicate_opt "
printf
(
"SET STATEMENT SQL_MODE='' FOR "
"SELECT concat('%%', GROUP_CONCAT(OPTION), '%%') INTO @replicate_opt "
" FROM"
" (SELECT DISTINCT concat('REPLICATE_', UPPER(ENGINE)) AS OPTION"
" FROM information_schema.TABLES"
...
...
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