database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixes while reviewing code

Browse Source 
(Cleanups and better bug fixes)


mysql-test/r/select.result:
  Fixed test after wrong merge
mysql-test/t/select.test:
  Fixed test after wrong merge
scripts/mysql_fix_privilege_tables.sh:
  Don't read defaults files
sql/item_cmpfunc.cc:
  Fix wrong value for not_null_tables_cache
sql/item_cmpfunc.h:
  Remove wrong patch (flags are set in fix_length_and_dec())
sql/item_func.h:
  Fix wrong value for not_null_tables_cache
sql/slave.cc:
  Fixed indentation
This commit is contained in:
unknown
2004-11-26 02:31:22 +02:00
parent fecd27a106
commit 60af920628
7 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mysql-test/r/select.result
View File

@ -2327,22 +2327,6 @@ select * from t2,t3 where t2.s = t3.s;
s s
two two
drop table t1, t2, t3;
CREATE TABLE t1 (
i int(11) NOT NULL default '0',
c char(10) NOT NULL default '',
PRIMARY KEY (i),
UNIQUE KEY c (c)
) TYPE=MyISAM;
INSERT INTO t1 VALUES (1,'a');
INSERT INTO t1 VALUES (2,'b');
INSERT INTO t1 VALUES (3,'c');
EXPLAIN SELECT i FROM t1 WHERE i=1;
table type possible_keys key key_len ref rows Extra
t1 const PRIMARY PRIMARY 4 const 1 Using index
EXPLAIN SELECT i FROM t1 WHERE i=1;
table type possible_keys key key_len ref rows Extra
t1 const PRIMARY PRIMARY 4 const 1 Using index
DROP TABLE t1;
create table t1 (a integer, b integer, index(a), index(b));
create table t2 (c integer, d integer, index(c), index(d));
insert into t1 values (1,2), (2,2), (3,2), (4,2);
@ -2364,3 +2348,19 @@ a b c d
3 2 3 4
4 2 4 4
drop table t1, t2;
CREATE TABLE t1 (
i int(11) NOT NULL default '0',
c char(10) NOT NULL default '',
PRIMARY KEY (i),
UNIQUE KEY c (c)
) TYPE=MyISAM;
INSERT INTO t1 VALUES (1,'a');
INSERT INTO t1 VALUES (2,'b');
INSERT INTO t1 VALUES (3,'c');
EXPLAIN SELECT i FROM t1 WHERE i=1;
table type possible_keys key key_len ref rows Extra
t1 const PRIMARY PRIMARY 4 const 1 Using index
EXPLAIN SELECT i FROM t1 WHERE i=1;
table type possible_keys key key_len ref rows Extra
t1 const PRIMARY PRIMARY 4 const 1 Using index
DROP TABLE t1;

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

@ -1887,7 +1887,7 @@ explain select * from t1 left join t2 on a=c where d in (4);
select * from t1 left join t2 on a=c where d in (4);
explain select * from t1 left join t2 on a=c where d = 4;
select * from t1 left join t2 on a=c where d = 4;
drop table t1, t2;R
drop table t1, t2;
#
# Covering index is mentioned in EXPLAIN output for const tables (bug #5333)

2
scripts/mysql_fix_privilege_tables.sh
View File

@ -74,7 +74,7 @@ parse_arguments()
parse_arguments "$@"
if test -z "$cmd"; then
cmd="$bindir/mysql -f --user=$user --host=$host"
cmd="$bindir/mysql --no-defaults --force --user=$user --host=$host"
if test ! -z "$root_password"; then
cmd="$cmd --password=$root_password"
fi

5
sql/item_cmpfunc.cc
View File

@ -293,7 +293,7 @@ void Item_func_interval::fix_length_and_dec()
}
maybe_null=0; max_length=2;
used_tables_cache|= item->used_tables();
not_null_tables_cache&= item->not_null_tables();
not_null_tables_cache= item->not_null_tables();
with_sum_func= with_sum_func || item->with_sum_func;
const_item_cache&= item->const_item();
}
@ -1087,7 +1087,8 @@ void Item_func_in::fix_length_and_dec()
maybe_null= item->maybe_null;
max_length=2;
used_tables_cache|= item->used_tables();
not_null_tables_cache&= item->not_null_tables();
/* not_null_tables_cache is only dependent on the argument to in */
not_null_tables_cache= item->not_null_tables();
const_item_cache&= item->const_item();
}

3
sql/item_cmpfunc.h
View File

@ -432,9 +432,6 @@ class Item_func_in :public Item_int_func
{
bool res= (item->fix_fields(thd,tlist) || Item_func::fix_fields(thd,tlist));
with_sum_func= with_sum_func || item->with_sum_func;
used_tables_cache|= item->used_tables();
not_null_tables_cache|= item->not_null_tables();
const_item_cache&= item->const_item();
return res;
}
void fix_length_and_dec();

2
sql/item_func.h
View File

@ -600,7 +600,7 @@ public:
{
maybe_null=0; max_length=3;
used_tables_cache|= item->used_tables();
not_null_tables_cache&= item->not_null_tables();
not_null_tables_cache= item->not_null_tables();
const_item_cache&= item->const_item();
with_sum_func= with_sum_func || item->with_sum_func;
}

3
sql/slave.cc
View File

@ -1637,7 +1637,8 @@ int init_master_info(MASTER_INFO* mi, const char* master_info_fname,
position is at the beginning of the file, and will read the
"signature" and then fast-forward to the last position read.
*/
if (thread_mask & SLAVE_SQL) {
if (thread_mask & SLAVE_SQL)
{
my_b_seek(mi->rli.cur_log, (my_off_t) 0);
}
DBUG_RETURN(0);