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
2a60c11f
Commit
2a60c11f
authored
Jan 31, 2006
by
andrey@lmy004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
partial fix for bug#16407 (sql_mode not regarded)
add sql_mode to mysql.event WL#1034 (Internal CRON)
parent
729f819d
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
129 additions
and
0 deletions
+129
-0
mysql-test/lib/init_db.sql
mysql-test/lib/init_db.sql
+32
-0
mysql-test/r/system_mysql_db.result
mysql-test/r/system_mysql_db.result
+1
-0
scripts/mysql_create_system_tables.sh
scripts/mysql_create_system_tables.sh
+32
-0
scripts/mysql_fix_privilege_tables.sql
scripts/mysql_fix_privilege_tables.sql
+64
-0
No files found.
mysql-test/lib/init_db.sql
View file @
2a60c11f
...
...
@@ -595,6 +595,38 @@ CREATE TABLE event (
ends
DATETIME
default
NULL
,
status
ENUM
(
'ENABLED'
,
'DISABLED'
)
NOT
NULL
default
'ENABLED'
,
on_completion
ENUM
(
'DROP'
,
'PRESERVE'
)
NOT
NULL
default
'DROP'
,
sql_mode
set
(
'REAL_AS_FLOAT'
,
'PIPES_AS_CONCAT'
,
'ANSI_QUOTES'
,
'IGNORE_SPACE'
,
'NOT_USED'
,
'ONLY_FULL_GROUP_BY'
,
'NO_UNSIGNED_SUBTRACTION'
,
'NO_DIR_IN_CREATE'
,
'POSTGRESQL'
,
'ORACLE'
,
'MSSQL'
,
'DB2'
,
'MAXDB'
,
'NO_KEY_OPTIONS'
,
'NO_TABLE_OPTIONS'
,
'NO_FIELD_OPTIONS'
,
'MYSQL323'
,
'MYSQL40'
,
'ANSI'
,
'NO_AUTO_VALUE_ON_ZERO'
,
'NO_BACKSLASH_ESCAPES'
,
'STRICT_TRANS_TABLES'
,
'STRICT_ALL_TABLES'
,
'NO_ZERO_IN_DATE'
,
'NO_ZERO_DATE'
,
'INVALID_DATES'
,
'ERROR_FOR_DIVISION_BY_ZERO'
,
'TRADITIONAL'
,
'NO_AUTO_CREATE_USER'
,
'HIGH_NOT_PRECEDENCE'
)
DEFAULT
''
NOT
NULL
,
comment
char
(
64
)
CHARACTER
SET
utf8
COLLATE
utf8_bin
NOT
NULL
default
''
,
PRIMARY
KEY
(
definer
,
db
,
name
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
utf8
COMMENT
'Events'
;
...
...
mysql-test/r/system_mysql_db.result
View file @
2a60c11f
...
...
@@ -203,6 +203,7 @@ event CREATE TABLE `event` (
`ends` datetime default NULL,
`status` enum('ENABLED','DISABLED') NOT NULL default 'ENABLED',
`on_completion` enum('DROP','PRESERVE') NOT NULL default 'DROP',
`sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE') NOT NULL default '',
`comment` char(64) character set utf8 collate utf8_bin NOT NULL default '',
PRIMARY KEY (`definer`,`db`,`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Events'
...
...
scripts/mysql_create_system_tables.sh
View file @
2a60c11f
...
...
@@ -791,6 +791,38 @@ then
c_ev
=
"
$c_ev
ends DATETIME default NULL,"
c_ev
=
"
$c_ev
status ENUM('ENABLED','DISABLED') NOT NULL default 'ENABLED',"
c_ev
=
"
$c_ev
on_completion ENUM('DROP','PRESERVE') NOT NULL default 'DROP',"
c_ev
=
"
$c_ev
sql_mode set("
c_ev
=
"
$c_ev
'REAL_AS_FLOAT',"
c_ev
=
"
$c_ev
'PIPES_AS_CONCAT',"
c_ev
=
"
$c_ev
'ANSI_QUOTES',"
c_ev
=
"
$c_ev
'IGNORE_SPACE',"
c_ev
=
"
$c_ev
'NOT_USED',"
c_ev
=
"
$c_ev
'ONLY_FULL_GROUP_BY',"
c_ev
=
"
$c_ev
'NO_UNSIGNED_SUBTRACTION',"
c_ev
=
"
$c_ev
'NO_DIR_IN_CREATE',"
c_ev
=
"
$c_ev
'POSTGRESQL',"
c_ev
=
"
$c_ev
'ORACLE',"
c_ev
=
"
$c_ev
'MSSQL',"
c_ev
=
"
$c_ev
'DB2',"
c_ev
=
"
$c_ev
'MAXDB',"
c_ev
=
"
$c_ev
'NO_KEY_OPTIONS',"
c_ev
=
"
$c_ev
'NO_TABLE_OPTIONS',"
c_ev
=
"
$c_ev
'NO_FIELD_OPTIONS',"
c_ev
=
"
$c_ev
'MYSQL323',"
c_ev
=
"
$c_ev
'MYSQL40',"
c_ev
=
"
$c_ev
'ANSI',"
c_ev
=
"
$c_ev
'NO_AUTO_VALUE_ON_ZERO',"
c_ev
=
"
$c_ev
'NO_BACKSLASH_ESCAPES',"
c_ev
=
"
$c_ev
'STRICT_TRANS_TABLES',"
c_ev
=
"
$c_ev
'STRICT_ALL_TABLES',"
c_ev
=
"
$c_ev
'NO_ZERO_IN_DATE',"
c_ev
=
"
$c_ev
'NO_ZERO_DATE',"
c_ev
=
"
$c_ev
'INVALID_DATES',"
c_ev
=
"
$c_ev
'ERROR_FOR_DIVISION_BY_ZERO',"
c_ev
=
"
$c_ev
'TRADITIONAL',"
c_ev
=
"
$c_ev
'NO_AUTO_CREATE_USER',"
c_ev
=
"
$c_ev
'HIGH_NOT_PRECEDENCE'"
c_ev
=
"
$c_ev
) DEFAULT '' NOT NULL,"
c_ev
=
"
$c_ev
comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',"
c_ev
=
"
$c_ev
PRIMARY KEY (definer, db, name)"
c_ev
=
"
$c_ev
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT 'Events';"
...
...
scripts/mysql_fix_privilege_tables.sql
View file @
2a60c11f
...
...
@@ -589,6 +589,38 @@ CREATE TABLE event (
ends DATETIME default NULL,
status ENUM('
ENABLED
','
DISABLED
') NOT NULL default '
ENABLED
',
on_completion ENUM('
DROP
','
PRESERVE
') NOT NULL default '
DROP
',
sql_mode set(
'
REAL_AS_FLOAT
',
'
PIPES_AS_CONCAT
',
'
ANSI_QUOTES
',
'
IGNORE_SPACE
',
'
NOT_USED
',
'
ONLY_FULL_GROUP_BY
',
'
NO_UNSIGNED_SUBTRACTION
',
'
NO_DIR_IN_CREATE
',
'
POSTGRESQL
',
'
ORACLE
',
'
MSSQL
',
'
DB2
',
'
MAXDB
',
'
NO_KEY_OPTIONS
',
'
NO_TABLE_OPTIONS
',
'
NO_FIELD_OPTIONS
',
'
MYSQL323
',
'
MYSQL40
',
'
ANSI
',
'
NO_AUTO_VALUE_ON_ZERO
',
'
NO_BACKSLASH_ESCAPES
',
'
STRICT_TRANS_TABLES
',
'
STRICT_ALL_TABLES
',
'
NO_ZERO_IN_DATE
',
'
NO_ZERO_DATE
',
'
INVALID_DATES
',
'
ERROR_FOR_DIVISION_BY_ZERO
',
'
TRADITIONAL
',
'
NO_AUTO_CREATE_USER
',
'
HIGH_NOT_PRECEDENCE
'
) DEFAULT
''
NOT NULL,
comment char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default
''
,
PRIMARY KEY (db,name)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT '
Events
';
...
...
@@ -602,4 +634,36 @@ ALTER TABLE user add Event_priv enum('N','Y') character set utf8 DEFAULT 'N' NOT
ALTER TABLE db add Event_priv enum('
N
','
Y
') character set utf8 DEFAULT '
N
' NOT NULL;
ALTER TABLE event DROP PRIMARY KEY;
ALTER TABLE event ADD PRIMARY KEY(definer, db, name);
ALTER TABLE proc MODIFY sql_mode
set('
REAL_AS_FLOAT
',
'
PIPES_AS_CONCAT
',
'
ANSI_QUOTES
',
'
IGNORE_SPACE
',
'
NOT_USED
',
'
ONLY_FULL_GROUP_BY
',
'
NO_UNSIGNED_SUBTRACTION
',
'
NO_DIR_IN_CREATE
',
'
POSTGRESQL
',
'
ORACLE
',
'
MSSQL
',
'
DB2
',
'
MAXDB
',
'
NO_KEY_OPTIONS
',
'
NO_TABLE_OPTIONS
',
'
NO_FIELD_OPTIONS
',
'
MYSQL323
',
'
MYSQL40
',
'
ANSI
',
'
NO_AUTO_VALUE_ON_ZERO
',
'
NO_BACKSLASH_ESCAPES
',
'
STRICT_TRANS_TABLES
',
'
STRICT_ALL_TABLES
',
'
NO_ZERO_IN_DATE
',
'
NO_ZERO_DATE
',
'
INVALID_DATES
',
'
ERROR_FOR_DIVISION_BY_ZERO
',
'
TRADITIONAL
',
'
NO_AUTO_CREATE_USER
',
'
HIGH_NOT_PRECEDENCE
'
) DEFAULT
''
NOT NULL;
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