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
547b056d
Commit
547b056d
authored
21 years ago
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WL#1106: Switch = --maxdb rather than --sapdb
parent
21e2957d
No related merge requests found
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
8 additions
and
8 deletions
+8
-8
mysql-test/r/sql_mode.result
mysql-test/r/sql_mode.result
+2
-2
mysql-test/t/sql_mode.test
mysql-test/t/sql_mode.test
+1
-1
sql/mysql_priv.h
sql/mysql_priv.h
+1
-1
sql/mysqld.cc
sql/mysqld.cc
+1
-1
sql/set_var.cc
sql/set_var.cc
+1
-1
sql/sql_show.cc
sql/sql_show.cc
+1
-1
sql/sql_yacc.yy
sql/sql_yacc.yy
+1
-1
No files found.
mysql-test/r/sql_mode.result
View file @
547b056d
...
...
@@ -71,10 +71,10 @@ t1 CREATE TABLE `t1` (
PRIMARY KEY (`a`),
UNIQUE KEY `email` (`email`)
) TYPE=HEAP ROW_FORMAT=DYNAMIC
set sql_mode="postgresql,oracle,mssql,db2,
sap
db";
set sql_mode="postgresql,oracle,mssql,db2,
max
db";
select @@sql_mode;
@@sql_mode
PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,POSTGRESQL,ORACLE,MSSQL,DB2,
SAP
DB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS
PIPES_AS_CONCAT,ANSI_QUOTES,IGNORE_SPACE,POSTGRESQL,ORACLE,MSSQL,DB2,
MAX
DB,NO_KEY_OPTIONS,NO_TABLE_OPTIONS,NO_FIELD_OPTIONS
show create table t1;
Table Create Table
t1 CREATE TABLE "t1" (
...
...
This diff is collapsed.
Click to expand it.
mysql-test/t/sql_mode.test
View file @
547b056d
...
...
@@ -24,7 +24,7 @@ show create table t1;
set
@@
sql_mode
=
"no_field_options,mysql323,mysql40"
;
show
variables
like
'sql_mode'
;
show
create
table
t1
;
set
sql_mode
=
"postgresql,oracle,mssql,db2,
sap
db"
;
set
sql_mode
=
"postgresql,oracle,mssql,db2,
max
db"
;
select
@@
sql_mode
;
show
create
table
t1
;
drop
table
t1
;
This diff is collapsed.
Click to expand it.
sql/mysql_priv.h
View file @
547b056d
...
...
@@ -214,7 +214,7 @@ extern CHARSET_INFO *national_charset_info, *table_alias_charset;
#define MODE_ORACLE 512
#define MODE_MSSQL 1024
#define MODE_DB2 2048
#define MODE_
SAP
DB 4096
#define MODE_
MAX
DB 4096
#define MODE_NO_KEY_OPTIONS 8192
#define MODE_NO_TABLE_OPTIONS 16384
#define MODE_NO_FIELD_OPTIONS 32768
...
...
This diff is collapsed.
Click to expand it.
sql/mysqld.cc
View file @
547b056d
...
...
@@ -211,7 +211,7 @@ const char *sql_mode_names[] =
"REAL_AS_FLOAT"
,
"PIPES_AS_CONCAT"
,
"ANSI_QUOTES"
,
"IGNORE_SPACE"
,
"?"
,
"ONLY_FULL_GROUP_BY"
,
"NO_UNSIGNED_SUBTRACTION"
,
"NO_DIR_IN_CREATE"
,
"POSTGRESQL"
,
"ORACLE"
,
"MSSQL"
,
"DB2"
,
"
SAP
DB"
,
"NO_KEY_OPTIONS"
,
"POSTGRESQL"
,
"ORACLE"
,
"MSSQL"
,
"DB2"
,
"
MAX
DB"
,
"NO_KEY_OPTIONS"
,
"NO_TABLE_OPTIONS"
,
"NO_FIELD_OPTIONS"
,
"MYSQL323"
,
"MYSQL40"
,
"ANSI"
,
"NO_AUTO_VALUE_ON_ZERO"
,
NullS
};
...
...
This diff is collapsed.
Click to expand it.
sql/set_var.cc
View file @
547b056d
...
...
@@ -2204,7 +2204,7 @@ ulong fix_sql_mode(ulong sql_mode)
MODE_IGNORE_SPACE
|
MODE_NO_KEY_OPTIONS
|
MODE_NO_TABLE_OPTIONS
|
MODE_NO_FIELD_OPTIONS
);
if
(
sql_mode
&
MODE_
SAP
DB
)
if
(
sql_mode
&
MODE_
MAX
DB
)
sql_mode
|=
(
MODE_PIPES_AS_CONCAT
|
MODE_ANSI_QUOTES
|
MODE_IGNORE_SPACE
|
MODE_NO_KEY_OPTIONS
|
MODE_NO_TABLE_OPTIONS
|
...
...
This diff is collapsed.
Click to expand it.
sql/sql_show.cc
View file @
547b056d
...
...
@@ -1073,7 +1073,7 @@ store_create_info(THD *thd, TABLE *table, String *packet)
MODE_ORACLE
|
MODE_MSSQL
|
MODE_DB2
|
MODE_
SAP
DB
|
MODE_
MAX
DB
|
MODE_ANSI
))
!=
0
;
my_bool
limited_mysql_mode
=
(
thd
->
variables
.
sql_mode
&
(
MODE_NO_FIELD_OPTIONS
|
MODE_MYSQL323
|
...
...
This diff is collapsed.
Click to expand it.
sql/sql_yacc.yy
View file @
547b056d
...
...
@@ -1250,7 +1250,7 @@ type:
| TIME_SYM { $$=FIELD_TYPE_TIME; }
| TIMESTAMP
{
if (YYTHD->variables.sql_mode & MODE_
SAP
DB)
if (YYTHD->variables.sql_mode & MODE_
MAX
DB)
$$=FIELD_TYPE_DATETIME;
else
$$=FIELD_TYPE_TIMESTAMP;
...
...
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