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
2669b866
Commit
2669b866
authored
Jul 05, 2005
by
jimw@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
parents
81cf9394
ac8f9d38
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
12 deletions
+33
-12
mysql-test/r/grant.result
mysql-test/r/grant.result
+5
-0
mysql-test/t/grant.test
mysql-test/t/grant.test
+9
-0
scripts/mysql_config.sh
scripts/mysql_config.sh
+13
-5
sql/sql_acl.cc
sql/sql_acl.cc
+2
-1
sql/sql_table.cc
sql/sql_table.cc
+4
-6
No files found.
mysql-test/r/grant.result
View file @
2669b866
...
@@ -586,3 +586,8 @@ use test;
...
@@ -586,3 +586,8 @@ use test;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM dummy@localhost;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM dummy@localhost;
DROP USER dummy@localhost;
DROP USER dummy@localhost;
DROP DATABASE mysqltest;
DROP DATABASE mysqltest;
use mysql;
insert into tables_priv values ('','test_db','mysqltest_1','test_table','test_grantor',CURRENT_TIMESTAMP,'Select','Select');
flush privileges;
delete from tables_priv where host = '' and user = 'mysqltest_1';
flush privileges;
mysql-test/t/grant.test
View file @
2669b866
...
@@ -470,3 +470,12 @@ use test;
...
@@ -470,3 +470,12 @@ use test;
REVOKE
ALL
PRIVILEGES
,
GRANT
OPTION
FROM
dummy
@
localhost
;
REVOKE
ALL
PRIVILEGES
,
GRANT
OPTION
FROM
dummy
@
localhost
;
DROP
USER
dummy
@
localhost
;
DROP
USER
dummy
@
localhost
;
DROP
DATABASE
mysqltest
;
DROP
DATABASE
mysqltest
;
#
# Bug #11330: Entry in tables_priv with host = '' causes crash
#
connection
default
;
use
mysql
;
insert
into
tables_priv
values
(
''
,
'test_db'
,
'mysqltest_1'
,
'test_table'
,
'test_grantor'
,
CURRENT_TIMESTAMP
,
'Select'
,
'Select'
);
flush
privileges
;
delete
from
tables_priv
where
host
=
''
and
user
=
'mysqltest_1'
;
flush
privileges
;
scripts/mysql_config.sh
View file @
2669b866
...
@@ -60,10 +60,18 @@ fix_path ()
...
@@ -60,10 +60,18 @@ fix_path ()
get_full_path
()
get_full_path
()
{
{
case
$1
in
file
=
$1
/
*
)
echo
"
$1
"
;;
./
*
)
tmp
=
`
pwd
`
/
$1
;
echo
$tmp
|
sed
-e
's;/\./;/;'
;;
# if the file is a symlink, try to resolve it
*
)
which
$1
;;
if
[
-h
$file
]
;
then
file
=
`
ls
-l
$file
|
awk
'{ print $NF }'
`
fi
case
$file
in
/
*
)
echo
"
$file
"
;;
*
/
*
)
tmp
=
`
pwd
`
/
$file
;
echo
$tmp
|
sed
-e
's;/\./;/;'
;;
*
)
which
$file
;;
esac
esac
}
}
...
...
sql/sql_acl.cc
View file @
2669b866
...
@@ -2035,7 +2035,8 @@ GRANT_TABLE::GRANT_TABLE(TABLE *form, TABLE *col_privs)
...
@@ -2035,7 +2035,8 @@ GRANT_TABLE::GRANT_TABLE(TABLE *form, TABLE *col_privs)
{
{
uint
key_prefix_len
;
uint
key_prefix_len
;
KEY_PART_INFO
*
key_part
=
col_privs
->
key_info
->
key_part
;
KEY_PART_INFO
*
key_part
=
col_privs
->
key_info
->
key_part
;
col_privs
->
field
[
0
]
->
store
(
host
.
hostname
,(
uint
)
strlen
(
host
.
hostname
),
col_privs
->
field
[
0
]
->
store
(
host
.
hostname
,
host
.
hostname
?
(
uint
)
strlen
(
host
.
hostname
)
:
0
,
system_charset_info
);
system_charset_info
);
col_privs
->
field
[
1
]
->
store
(
db
,(
uint
)
strlen
(
db
),
system_charset_info
);
col_privs
->
field
[
1
]
->
store
(
db
,(
uint
)
strlen
(
db
),
system_charset_info
);
col_privs
->
field
[
2
]
->
store
(
user
,(
uint
)
strlen
(
user
),
system_charset_info
);
col_privs
->
field
[
2
]
->
store
(
user
,(
uint
)
strlen
(
user
),
system_charset_info
);
...
...
sql/sql_table.cc
View file @
2669b866
...
@@ -1550,14 +1550,12 @@ bool mysql_create_table(THD *thd,const char *db, const char *table_name,
...
@@ -1550,14 +1550,12 @@ bool mysql_create_table(THD *thd,const char *db, const char *table_name,
/* Check if table exists */
/* Check if table exists */
if
(
create_info
->
options
&
HA_LEX_CREATE_TMP_TABLE
)
if
(
create_info
->
options
&
HA_LEX_CREATE_TMP_TABLE
)
{
{
char
tmp_table_name
[
tmp_file_prefix_length
+
22
+
22
+
22
+
3
];
my_snprintf
(
path
,
sizeof
(
path
),
"%s%s%lx_%lx_%x%s"
,
my_snprintf
(
tmp_table_name
,
sizeof
(
tmp_table_name
),
"%s%lx_%lx_%x"
,
mysql_tmpdir
,
tmp_file_prefix
,
current_pid
,
thd
->
thread_id
,
tmp_file_prefix
,
current_pid
,
thd
->
thread_id
,
thd
->
tmp_table
++
,
reg_ext
);
thd
->
tmp_table
++
);
if
(
lower_case_table_names
)
if
(
lower_case_table_names
)
my_casedn_str
(
files_charset_info
,
tmp_table_name
);
my_casedn_str
(
files_charset_info
,
path
);
create_info
->
table_options
|=
HA_CREATE_DELAY_KEY_WRITE
;
create_info
->
table_options
|=
HA_CREATE_DELAY_KEY_WRITE
;
build_table_path
(
path
,
sizeof
(
path
),
db
,
tmp_table_name
,
reg_ext
);
}
}
else
else
build_table_path
(
path
,
sizeof
(
path
),
db
,
alias
,
reg_ext
);
build_table_path
(
path
,
sizeof
(
path
),
db
,
alias
,
reg_ext
);
...
...
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