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
6c5b0844
Commit
6c5b0844
authored
Jan 06, 2005
by
brian@zim.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge for 5.0 to 5.1
parents
5010be1d
cc8def73
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
4 deletions
+20
-4
BitKeeper/etc/logging_ok
BitKeeper/etc/logging_ok
+1
-0
BitKeeper/triggers/post-commit
BitKeeper/triggers/post-commit
+1
-1
configure.in
configure.in
+2
-1
scripts/mysql_fix_privilege_tables.sql
scripts/mysql_fix_privilege_tables.sql
+14
-1
sql/sql_acl.cc
sql/sql_acl.cc
+2
-0
sql/sql_acl.h
sql/sql_acl.h
+0
-1
No files found.
BitKeeper/etc/logging_ok
View file @
6c5b0844
...
@@ -34,6 +34,7 @@ bk@mysql.r18.ru
...
@@ -34,6 +34,7 @@ bk@mysql.r18.ru
brian@avenger.(none)
brian@avenger.(none)
brian@brian-akers-computer.local
brian@brian-akers-computer.local
brian@private-client-ip-101.oz.net
brian@private-client-ip-101.oz.net
brian@zim.(none)
carsten@tsort.bitbybit.dk
carsten@tsort.bitbybit.dk
cps@silver_beast.(none)
cps@silver_beast.(none)
davida@isil.mysql.com
davida@isil.mysql.com
...
...
BitKeeper/triggers/post-commit
View file @
6c5b0844
...
@@ -5,7 +5,7 @@ FROM=$USER@mysql.com
...
@@ -5,7 +5,7 @@ FROM=$USER@mysql.com
INTERNALS
=
internals@lists.mysql.com
INTERNALS
=
internals@lists.mysql.com
DOCS
=
docs-commit@mysql.com
DOCS
=
docs-commit@mysql.com
LIMIT
=
10000
LIMIT
=
10000
VERSION
=
"5.
0
"
VERSION
=
"5.
1
"
if
[
"
$REAL_EMAIL
"
=
""
]
if
[
"
$REAL_EMAIL
"
=
""
]
then
then
...
...
configure.in
View file @
6c5b0844
...
@@ -5,8 +5,9 @@ AC_PREREQ(2.50)dnl Minimum Autoconf version required.
...
@@ -5,8 +5,9 @@ AC_PREREQ(2.50)dnl Minimum Autoconf version required.
AC_INIT
(
sql/mysqld.cc
)
AC_INIT
(
sql/mysqld.cc
)
AC_CANONICAL_SYSTEM
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
# Don't forget to also update the NDB lines below.
# Don't forget to also update the NDB lines below.
AM_INIT_AUTOMAKE
(
mysql, 5.
0.3
-alpha
)
AM_INIT_AUTOMAKE
(
mysql, 5.
1.0
-alpha
)
AM_CONFIG_HEADER
(
config.h
)
AM_CONFIG_HEADER
(
config.h
)
PROTOCOL_VERSION
=
10
PROTOCOL_VERSION
=
10
...
...
scripts/mysql_fix_privilege_tables.sql
View file @
6c5b0844
...
@@ -114,7 +114,6 @@ UPDATE user SET Show_db_priv= Select_priv, Super_priv=Process_priv, Execute_priv
...
@@ -114,7 +114,6 @@ UPDATE user SET Show_db_priv= Select_priv, Super_priv=Process_priv, Execute_priv
-- Add fields that can be used to limit number of questions and connections
-- Add fields that can be used to limit number of questions and connections
-- for some users.
-- for some users.
ALTER
TABLE
user
ALTER
TABLE
user
ADD
max_questions
int
(
11
)
NOT
NULL
DEFAULT
0
AFTER
x509_subject
,
ADD
max_questions
int
(
11
)
NOT
NULL
DEFAULT
0
AFTER
x509_subject
,
ADD
max_updates
int
(
11
)
unsigned
NOT
NULL
DEFAULT
0
AFTER
max_questions
,
ADD
max_updates
int
(
11
)
unsigned
NOT
NULL
DEFAULT
0
AFTER
max_questions
,
...
@@ -132,6 +131,20 @@ ALTER TABLE host
...
@@ -132,6 +131,20 @@ ALTER TABLE host
ADD
Create_tmp_table_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
,
ADD
Create_tmp_table_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
,
ADD
Lock_tables_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
;
ADD
Lock_tables_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
;
#
#
Create
VIEWs
privrlages
(
v5
.
1
)
#
ALTER
TABLE
db
ADD
Create_view_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
AFTER
Lock_tables_priv
;
ALTER
TABLE
host
ADD
Create_view_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
AFTER
Lock_tables_priv
;
ALTER
TABLE
user
ADD
Create_view_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
AFTER
Repl_client_priv
;
#
#
Show
VIEWs
privrlages
(
v5
.
1
)
#
ALTER
TABLE
db
ADD
Show_view_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
AFTER
Create_view_priv
;
ALTER
TABLE
host
ADD
Show_view_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
AFTER
Create_view_priv
;
ALTER
TABLE
user
ADD
Show_view_priv
enum
(
'N'
,
'Y'
)
DEFAULT
'N'
NOT
NULL
AFTER
Create_view_priv
;
alter
table
db
change
Db
Db
char
(
64
)
binary
DEFAULT
''
NOT
NULL
;
alter
table
db
change
Db
Db
char
(
64
)
binary
DEFAULT
''
NOT
NULL
;
alter
table
host
change
Db
Db
char
(
64
)
binary
DEFAULT
''
NOT
NULL
;
alter
table
host
change
Db
Db
char
(
64
)
binary
DEFAULT
''
NOT
NULL
;
alter
table
user
change
max_questions
max_questions
int
(
11
)
unsigned
DEFAULT
0
NOT
NULL
;
alter
table
user
change
max_questions
max_questions
int
(
11
)
unsigned
DEFAULT
0
NOT
NULL
;
...
...
sql/sql_acl.cc
View file @
6c5b0844
...
@@ -37,6 +37,8 @@
...
@@ -37,6 +37,8 @@
#ifndef NO_EMBEDDED_ACCESS_CHECKS
#ifndef NO_EMBEDDED_ACCESS_CHECKS
#define FIRST_NON_YN_FIELD 26
class
acl_entry
:
public
hash_filo_element
class
acl_entry
:
public
hash_filo_element
{
{
public:
public:
...
...
sql/sql_acl.h
View file @
6c5b0844
...
@@ -45,7 +45,6 @@
...
@@ -45,7 +45,6 @@
in sql_show.cc when adding new privileges!
in sql_show.cc when adding new privileges!
*/
*/
#define DB_ACLS \
#define DB_ACLS \
(UPDATE_ACL | SELECT_ACL | INSERT_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \
(UPDATE_ACL | SELECT_ACL | INSERT_ACL | DELETE_ACL | CREATE_ACL | DROP_ACL | \
GRANT_ACL | REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_TMP_ACL | \
GRANT_ACL | REFERENCES_ACL | INDEX_ACL | ALTER_ACL | CREATE_TMP_ACL | \
...
...
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