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
94bc7ce8
Commit
94bc7ce8
authored
Jan 14, 2001
by
monty@donna.mysql.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed that --open-files-limit works on Linux
parent
6295e1b1
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
110 additions
and
33 deletions
+110
-33
BitKeeper/etc/gone
BitKeeper/etc/gone
+1
-0
Docs/manual.texi
Docs/manual.texi
+68
-25
sql/ha_berkeley.cc
sql/ha_berkeley.cc
+30
-0
sql/mysqld.cc
sql/mysqld.cc
+1
-1
sql/sql_base.cc
sql/sql_base.cc
+1
-1
sql/sql_parse.cc
sql/sql_parse.cc
+9
-6
No files found.
BitKeeper/etc/gone
View file @
94bc7ce8
...
@@ -316,3 +316,4 @@ sasha@work.mysql.com|BitKeeper/etc/logging_ok|20001214015456|29919|32b6551b8288c
...
@@ -316,3 +316,4 @@ sasha@work.mysql.com|BitKeeper/etc/logging_ok|20001214015456|29919|32b6551b8288c
serg@serg.mysql.com|mysql-test/r/3.23/mrg000001.dummy.result|20001206231604|05053|bf7e6d609f22b897
serg@serg.mysql.com|mysql-test/r/3.23/mrg000001.dummy.result|20001206231604|05053|bf7e6d609f22b897
serg@serg.mysql.com|mysql-test/r/3.23/mrg000001.result|20001206231609|46662|db2ef2e717ab8332
serg@serg.mysql.com|mysql-test/r/3.23/mrg000001.result|20001206231609|46662|db2ef2e717ab8332
mwagner@evoq.home.mwagner.org|mysql-test/chew_on_this/select.res|20001014084759|41327|1295456b9394876
mwagner@evoq.home.mwagner.org|mysql-test/chew_on_this/select.res|20001014084759|41327|1295456b9394876
mwagner@evoq.home.mwagner.org|mysql-test/chew_on_this/select.res|20001014084759|41327|1295456b93948768
Docs/manual.texi
View file @
94bc7ce8
This diff is collapsed.
Click to expand it.
sql/ha_berkeley.cc
View file @
94bc7ce8
...
@@ -119,6 +119,8 @@ bool berkeley_init(void)
...
@@ -119,6 +119,8 @@ bool berkeley_init(void)
berkeley_tmpdir
=
mysql_tmpdir
;
berkeley_tmpdir
=
mysql_tmpdir
;
if
(
!
berkeley_home
)
if
(
!
berkeley_home
)
berkeley_home
=
mysql_real_data_home
;
berkeley_home
=
mysql_real_data_home
;
DBUG_PRINT
(
"bdb"
,(
"berkeley_home: %s"
,
mysql_real_data_home
));
/*
/*
If we don't set set_lg_bsize() we will get into trouble when
If we don't set set_lg_bsize() we will get into trouble when
trying to use many open BDB tables.
trying to use many open BDB tables.
...
@@ -1675,6 +1677,34 @@ int ha_berkeley::external_lock(THD *thd, int lock_type)
...
@@ -1675,6 +1677,34 @@ int ha_berkeley::external_lock(THD *thd, int lock_type)
DBUG_RETURN
(
error
);
DBUG_RETURN
(
error
);
}
}
/*
The idea with handler::store_lock() is the following:
The statement decided which locks we should need for the table
for updates/deletes/inserts we get WRITE locks, for SELECT... we get
read locks.
Before adding the lock into the table lock handler (see thr_lock.c)
mysqld calls store lock with the requested locks. Store lock can now
modify a write lock to a read lock (or some other lock), ignore the
lock (if we don't want to use MySQL table locks at all) or add locks
for many tables (like we do when we are using a MERGE handler).
Berkeley DB changes all WRITE locks to TL_WRITE_ALLOW_WRITE (which
signals that we are doing WRITES, but we are still allowing other
reader's and writer's.
When releasing locks, store_lock() are also called. In this case one
usually doesn't have to do anything.
In some exceptional cases MySQL may send a request for a TL_IGNORE;
This means that we are requesting the same lock as last time and this
should also be ignored. (This may happen when someone does a flush
table when we have opened a part of the tables, in which case mysqld
closes and reopens the tables and tries to get the same locks at last
time). In the future we will probably try to remove this.
*/
THR_LOCK_DATA
**
ha_berkeley
::
store_lock
(
THD
*
thd
,
THR_LOCK_DATA
**
to
,
THR_LOCK_DATA
**
ha_berkeley
::
store_lock
(
THD
*
thd
,
THR_LOCK_DATA
**
to
,
enum
thr_lock_type
lock_type
)
enum
thr_lock_type
lock_type
)
...
...
sql/mysqld.cc
View file @
94bc7ce8
...
@@ -119,7 +119,7 @@ inline void reset_floating_point_exceptions()
...
@@ -119,7 +119,7 @@ inline void reset_floating_point_exceptions()
#else
#else
#include <my_pthread.h> // For thr_setconcurency()
#include <my_pthread.h> // For thr_setconcurency()
#endif
#endif
#if defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE) && !defined(
__linux__) && !defined(
HAVE_mit_thread)
#if defined(HAVE_GETRLIMIT) && defined(RLIMIT_NOFILE) && !defined(HAVE_mit_thread)
#define SET_RLIMIT_NOFILE
#define SET_RLIMIT_NOFILE
#endif
#endif
...
...
sql/sql_base.cc
View file @
94bc7ce8
...
@@ -1610,7 +1610,7 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables)
...
@@ -1610,7 +1610,7 @@ find_field_in_tables(THD *thd,Item_field *item,TABLE_LIST *tables)
char
buff
[
NAME_LEN
*
2
+
1
];
char
buff
[
NAME_LEN
*
2
+
1
];
if
(
db
)
if
(
db
)
{
{
strx
mov
(
buff
,
db
,
"."
,
table_name
,
NullS
);
strx
nmov
(
buff
,
sizeof
(
buff
)
-
1
,
db
,
"."
,
table_name
,
NullS
);
table_name
=
buff
;
table_name
=
buff
;
}
}
my_printf_error
(
ER_UNKNOWN_TABLE
,
ER
(
ER_UNKNOWN_TABLE
),
MYF
(
0
),
table_name
,
my_printf_error
(
ER_UNKNOWN_TABLE
,
ER
(
ER_UNKNOWN_TABLE
),
MYF
(
0
),
table_name
,
...
...
sql/sql_parse.cc
View file @
94bc7ce8
...
@@ -1784,8 +1784,8 @@ mysql_execute_command(void)
...
@@ -1784,8 +1784,8 @@ mysql_execute_command(void)
break
;
break
;
case
SQLCOM_SHOW_GRANTS
:
case
SQLCOM_SHOW_GRANTS
:
res
=
0
;
res
=
0
;
if
((
thd
->
user
&&
!
strcmp
(
thd
->
user
,
lex
->
grant_user
->
user
.
str
))
||
if
((
thd
->
priv_user
&&
!
strcmp
(
thd
->
priv_
user
,
lex
->
grant_user
->
user
.
str
))
||
!
(
check_access
(
thd
,
SELECT_ACL
,
"mysql"
)
))
!
check_access
(
thd
,
SELECT_ACL
,
"mysql"
,
0
,
1
))
{
{
res
=
mysql_show_grants
(
thd
,
lex
->
grant_user
);
res
=
mysql_show_grants
(
thd
,
lex
->
grant_user
);
}
}
...
@@ -1854,7 +1854,7 @@ error:
...
@@ -1854,7 +1854,7 @@ error:
bool
bool
check_access
(
THD
*
thd
,
uint
want_access
,
const
char
*
db
,
uint
*
save_priv
,
check_access
(
THD
*
thd
,
uint
want_access
,
const
char
*
db
,
uint
*
save_priv
,
bool
no_grant
)
bool
dont_check_global_grants
)
{
{
uint
db_access
,
dummy
;
uint
db_access
,
dummy
;
if
(
save_priv
)
if
(
save_priv
)
...
@@ -1862,7 +1862,7 @@ check_access(THD *thd,uint want_access,const char *db, uint *save_priv,
...
@@ -1862,7 +1862,7 @@ check_access(THD *thd,uint want_access,const char *db, uint *save_priv,
else
else
save_priv
=
&
dummy
;
save_priv
=
&
dummy
;
if
(
!
db
&&
!
thd
->
db
&&
!
no_grant
)
if
(
!
db
&&
!
thd
->
db
&&
!
dont_check_global_grants
)
{
{
send_error
(
&
thd
->
net
,
ER_NO_DB_ERROR
);
/* purecov: tested */
send_error
(
&
thd
->
net
,
ER_NO_DB_ERROR
);
/* purecov: tested */
return
TRUE
;
/* purecov: tested */
return
TRUE
;
/* purecov: tested */
...
@@ -1874,7 +1874,7 @@ check_access(THD *thd,uint want_access,const char *db, uint *save_priv,
...
@@ -1874,7 +1874,7 @@ check_access(THD *thd,uint want_access,const char *db, uint *save_priv,
return
FALSE
;
return
FALSE
;
}
}
if
((
want_access
&
~
thd
->
master_access
)
&
~
(
DB_ACLS
|
EXTRA_ACL
)
||
if
((
want_access
&
~
thd
->
master_access
)
&
~
(
DB_ACLS
|
EXTRA_ACL
)
||
!
db
&&
no_grant
)
!
db
&&
dont_check_global_grants
)
{
// We can never grant this
{
// We can never grant this
net_printf
(
&
thd
->
net
,
ER_ACCESS_DENIED_ERROR
,
net_printf
(
&
thd
->
net
,
ER_ACCESS_DENIED_ERROR
,
thd
->
priv_user
,
thd
->
priv_user
,
...
@@ -1892,8 +1892,11 @@ check_access(THD *thd,uint want_access,const char *db, uint *save_priv,
...
@@ -1892,8 +1892,11 @@ check_access(THD *thd,uint want_access,const char *db, uint *save_priv,
db_access
=
thd
->
db_access
;
db_access
=
thd
->
db_access
;
want_access
&=
~
EXTRA_ACL
;
// Remove SHOW attribute
want_access
&=
~
EXTRA_ACL
;
// Remove SHOW attribute
db_access
=
((
*
save_priv
=
(
db_access
|
thd
->
master_access
))
&
want_access
);
db_access
=
((
*
save_priv
=
(
db_access
|
thd
->
master_access
))
&
want_access
);
/* grant_option is set if there exists a single table or column grant */
if
(
db_access
==
want_access
||
if
(
db_access
==
want_access
||
((
grant_option
&&
!
no_grant
)
&&
!
(
want_access
&
~
TABLE_ACLS
)))
((
grant_option
&&
!
dont_check_global_grants
)
&&
!
(
want_access
&
~
TABLE_ACLS
)))
return
FALSE
;
/* Ok */
return
FALSE
;
/* Ok */
net_printf
(
&
thd
->
net
,
ER_DBACCESS_DENIED_ERROR
,
net_printf
(
&
thd
->
net
,
ER_DBACCESS_DENIED_ERROR
,
thd
->
priv_user
,
thd
->
priv_user
,
...
...
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