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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
62465a98
Commit
62465a98
authored
Mar 15, 2005
by
sergefp@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/psergey/mysql-4.1-bug8510
into mysql.com:/home/psergey/mysql-5.0-bug8510
parents
6a2ef557
e7e2a8c8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
4 deletions
+11
-4
mysql-test/r/ansi.result
mysql-test/r/ansi.result
+2
-2
mysql-test/t/ansi.test
mysql-test/t/ansi.test
+2
-1
sql/set_var.cc
sql/set_var.cc
+7
-1
No files found.
mysql-test/r/ansi.result
View file @
62465a98
...
@@ -6,7 +6,7 @@ NO_FIELD_OPTIONS,MYSQL40,HIGH_NOT_PRECEDENCE
...
@@ -6,7 +6,7 @@ NO_FIELD_OPTIONS,MYSQL40,HIGH_NOT_PRECEDENCE
set @@sql_mode="ANSI";
set @@sql_mode="ANSI";
select @@sql_mode;
select @@sql_mode;
@@sql_mode
@@sql_mode
REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,
ONLY_FULL_GROUP_BY,
ANSI
REAL_AS_FLOAT,PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,ANSI
SELECT 'A' || 'B';
SELECT 'A' || 'B';
'A' || 'B'
'A' || 'B'
AB
AB
...
@@ -14,6 +14,6 @@ CREATE TABLE t1 (id INT, id2 int);
...
@@ -14,6 +14,6 @@ CREATE TABLE t1 (id INT, id2 int);
SELECT id,NULL,1,1.1,'a' FROM t1 GROUP BY id;
SELECT id,NULL,1,1.1,'a' FROM t1 GROUP BY id;
id NULL 1 1.1 a
id NULL 1 1.1 a
SELECT id FROM t1 GROUP BY id2;
SELECT id FROM t1 GROUP BY id2;
ERROR 42000: 'test.t1.id' isn't in GROUP BY
id
drop table t1;
drop table t1;
SET @@SQL_MODE="";
SET @@SQL_MODE="";
mysql-test/t/ansi.test
View file @
62465a98
...
@@ -19,7 +19,8 @@ SELECT 'A' || 'B';
...
@@ -19,7 +19,8 @@ SELECT 'A' || 'B';
CREATE
TABLE
t1
(
id
INT
,
id2
int
);
CREATE
TABLE
t1
(
id
INT
,
id2
int
);
SELECT
id
,
NULL
,
1
,
1.1
,
'a'
FROM
t1
GROUP
BY
id
;
SELECT
id
,
NULL
,
1
,
1.1
,
'a'
FROM
t1
GROUP
BY
id
;
--
error
1055
#No --error 1055 error due to temporary fix for BUG#8510:
#ONLY_FULL_GROUP_BY is overly restrictive, so remove it from ANSI mode.
SELECT
id
FROM
t1
GROUP
BY
id2
;
SELECT
id
FROM
t1
GROUP
BY
id2
;
drop
table
t1
;
drop
table
t1
;
...
...
sql/set_var.cc
View file @
62465a98
...
@@ -3282,8 +3282,14 @@ ulong fix_sql_mode(ulong sql_mode)
...
@@ -3282,8 +3282,14 @@ ulong fix_sql_mode(ulong sql_mode)
*/
*/
if
(
sql_mode
&
MODE_ANSI
)
if
(
sql_mode
&
MODE_ANSI
)
{
sql_mode
|=
(
MODE_REAL_AS_FLOAT
|
MODE_PIPES_AS_CONCAT
|
MODE_ANSI_QUOTES
|
sql_mode
|=
(
MODE_REAL_AS_FLOAT
|
MODE_PIPES_AS_CONCAT
|
MODE_ANSI_QUOTES
|
MODE_IGNORE_SPACE
|
MODE_ONLY_FULL_GROUP_BY
);
MODE_IGNORE_SPACE
);
/*
MODE_ONLY_FULL_GROUP_BY removed from ANSI mode because it is currently
overly restrictive (see BUG#8510).
*/
}
if
(
sql_mode
&
MODE_ORACLE
)
if
(
sql_mode
&
MODE_ORACLE
)
sql_mode
|=
(
MODE_PIPES_AS_CONCAT
|
MODE_ANSI_QUOTES
|
sql_mode
|=
(
MODE_PIPES_AS_CONCAT
|
MODE_ANSI_QUOTES
|
MODE_IGNORE_SPACE
|
MODE_IGNORE_SPACE
|
...
...
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