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
04d363d1
Commit
04d363d1
authored
Dec 07, 2007
by
tsmith@ramayana.hindu.god
Browse files
Options
Browse Files
Download
Plain Diff
Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
parents
45c78260
bf6292ea
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
1 deletion
+5
-1
mysql-test/r/grant.result
mysql-test/r/grant.result
+2
-0
mysql-test/t/grant.test
mysql-test/t/grant.test
+2
-0
sql/sql_select.cc
sql/sql_select.cc
+1
-1
No files found.
mysql-test/r/grant.result
View file @
04d363d1
...
@@ -1194,6 +1194,7 @@ ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table '
...
@@ -1194,6 +1194,7 @@ ERROR 42000: SELECT command denied to user 'mysqltest_2'@'localhost' for table '
DROP DATABASE mysqltest1;
DROP DATABASE mysqltest1;
DROP DATABASE mysqltest2;
DROP DATABASE mysqltest2;
DROP USER mysqltest_1@localhost;
DROP USER mysqltest_1@localhost;
DROP USER mysqltest_2@localhost;
use test;
use test;
CREATE TABLE t1 (f1 int, f2 int);
CREATE TABLE t1 (f1 int, f2 int);
INSERT INTO t1 VALUES(1,1), (2,2);
INSERT INTO t1 VALUES(1,1), (2,2);
...
@@ -1213,6 +1214,7 @@ f1 f2
...
@@ -1213,6 +1214,7 @@ f1 f2
REVOKE UPDATE (f1) ON `test`.`t1` FROM 'mysqltest_1'@'localhost';
REVOKE UPDATE (f1) ON `test`.`t1` FROM 'mysqltest_1'@'localhost';
REVOKE SELECT ON `test`.* FROM 'mysqltest_1'@'localhost';
REVOKE SELECT ON `test`.* FROM 'mysqltest_1'@'localhost';
REVOKE ALL ON db27878.* FROM 'mysqltest_1'@'localhost';
REVOKE ALL ON db27878.* FROM 'mysqltest_1'@'localhost';
DROP USER mysqltest_1@localhost;
DROP DATABASE db27878;
DROP DATABASE db27878;
use test;
use test;
DROP TABLE t1;
DROP TABLE t1;
...
...
mysql-test/t/grant.test
View file @
04d363d1
...
@@ -1235,6 +1235,7 @@ DROP DATABASE mysqltest1;
...
@@ -1235,6 +1235,7 @@ DROP DATABASE mysqltest1;
DROP
DATABASE
mysqltest2
;
DROP
DATABASE
mysqltest2
;
DROP
USER
mysqltest_1
@
localhost
;
DROP
USER
mysqltest_1
@
localhost
;
DROP
USER
mysqltest_2
@
localhost
;
#
#
# Bug#27878: Unchecked privileges on a view referring to a table from another
# Bug#27878: Unchecked privileges on a view referring to a table from another
...
@@ -1260,6 +1261,7 @@ connection default;
...
@@ -1260,6 +1261,7 @@ connection default;
REVOKE
UPDATE
(
f1
)
ON
`test`
.
`t1`
FROM
'mysqltest_1'
@
'localhost'
;
REVOKE
UPDATE
(
f1
)
ON
`test`
.
`t1`
FROM
'mysqltest_1'
@
'localhost'
;
REVOKE
SELECT
ON
`test`
.*
FROM
'mysqltest_1'
@
'localhost'
;
REVOKE
SELECT
ON
`test`
.*
FROM
'mysqltest_1'
@
'localhost'
;
REVOKE
ALL
ON
db27878
.*
FROM
'mysqltest_1'
@
'localhost'
;
REVOKE
ALL
ON
db27878
.*
FROM
'mysqltest_1'
@
'localhost'
;
DROP
USER
mysqltest_1
@
localhost
;
DROP
DATABASE
db27878
;
DROP
DATABASE
db27878
;
use
test
;
use
test
;
DROP
TABLE
t1
;
DROP
TABLE
t1
;
...
...
sql/sql_select.cc
View file @
04d363d1
...
@@ -9224,7 +9224,7 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table,
...
@@ -9224,7 +9224,7 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table,
{
{
uint8
dec
=
item
->
decimals
;
uint8
dec
=
item
->
decimals
;
uint8
intg
=
((
Item_decimal
*
)
item
)
->
decimal_precision
()
-
dec
;
uint8
intg
=
((
Item_decimal
*
)
item
)
->
decimal_precision
()
-
dec
;
uint
8
len
=
item
->
max_length
;
uint
32
len
=
item
->
max_length
;
/*
/*
Trying to put too many digits overall in a DECIMAL(prec,dec)
Trying to put too many digits overall in a DECIMAL(prec,dec)
...
...
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