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
2c41c770
Commit
2c41c770
authored
Nov 01, 2005
by
monty@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/my/mysql-5.0
parents
bb342220
3a072a0e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
BUILD/SETUP.sh
BUILD/SETUP.sh
+2
-2
sql/table.cc
sql/table.cc
+2
-2
No files found.
BUILD/SETUP.sh
View file @
2c41c770
...
...
@@ -52,9 +52,9 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch
#debug_extra_warnings="-Wuninitialized"
c_warnings
=
"
$global_warnings
-Wunused"
cxx_warnings
=
"
$global_warnings
-Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
base_max_configs
=
"--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine"
base_max_configs
=
"--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine
--with-yassl
"
base_max_no_ndb_configs
=
"--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine"
max_leave_isam_configs
=
"--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-
open
ssl --with-embedded-server --with-big-tables"
max_leave_isam_configs
=
"--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-
ya
ssl --with-embedded-server --with-big-tables"
max_configs
=
"
$base_max_configs
--with-embedded-server"
max_no_ndb_configs
=
"
$base_max_no_ndb_configs
--with-embedded-server"
...
...
sql/table.cc
View file @
2c41c770
...
...
@@ -2511,9 +2511,9 @@ bool st_table_list::prepare_security(THD *thd)
{
List_iterator_fast
<
TABLE_LIST
>
tb
(
*
view_tables
);
TABLE_LIST
*
tbl
;
DBUG_ENTER
(
"st_table_list::prepare_security"
);
#ifndef NO_EMBEDDED_ACCESS_CHECKS
Security_context
*
save_security_ctx
=
thd
->
security_ctx
;
DBUG_ENTER
(
"st_table_list::prepare_security"
);
DBUG_ASSERT
(
!
prelocking_placeholder
);
if
(
prepare_view_securety_context
(
thd
))
...
...
@@ -2538,11 +2538,11 @@ bool st_table_list::prepare_security(THD *thd)
tbl
->
table
->
grant
=
grant
;
}
thd
->
security_ctx
=
save_security_ctx
;
DBUG_RETURN
(
FALSE
);
#else
while
((
tbl
=
tb
++
))
tbl
->
grant
.
privilege
=
~
NO_ACCESS
;
#endif
DBUG_RETURN
(
FALSE
);
}
...
...
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