database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

code cleanup

Browse Source
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2003-04-29 14:13:22 +03:00
parent 5d3df7610f
commit 89d9766fd2
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/r/innodb.result
View File

@@ -1219,6 +1219,7 @@ parent child
1 2
1 3
2 1
drop table t1;
create table t1 (a int not null auto_increment primary key, b int, c int, key(c)) type=innodb;
create table t2 (a int not null auto_increment primary key, b int);
insert into t1 (b) values (null),(null),(null),(null),(null),(null),(null);

2
mysql-test/t/innodb.test
View File

@@ -809,7 +809,7 @@ drop table t1,t2;
create table t1 ( pk int primary key, parent int not null, child int not null, index (parent) ) type = innodb;
insert into t1 values (1,0,4), (2,1,3), (3,2,1), (4,1,2);
select distinct parent,child from t1 order by parent;
drop table t1,t2;
drop table t1;
#
# Test that MySQL priorities clustered indexes

3
sql/sql_base.cc
View File

@@ -1984,7 +1984,8 @@ insert_fields(THD *thd,TABLE_LIST *tables, const char *db_name,
(!db_name || !strcmp(tables->db,db_name))))
{
/* Ensure that we have access right to all columns */
if (grant_option && !thd->master_access &&
if (grant_option && !((thd->master_access | table->grant.privilege) &
table->grant.want_privilege) &&
check_grant_all_columns(thd,SELECT_ACL,table) )
DBUG_RETURN(-1);
Field **ptr=table->field,*field;