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

merged

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
innobase/srv/srv0srv.c:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/slave.cc:
  Auto merged
This commit is contained in:
unknown
2004-11-28 18:19:01 +01:00
parent 5607539c5b 59abcd447c
commit dd33501f9e
6 changed files with 63 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
innobase/srv/srv0srv.c
View File

@@ -1677,11 +1677,13 @@ loop:
srv_printf_innodb_monitor(stderr); srv_printf_innodb_monitor(stderr);
} }
mutex_enter(&srv_monitor_file_mutex); if (srv_innodb_status) {
rewind(srv_monitor_file); mutex_enter(&srv_monitor_file_mutex);
srv_printf_innodb_monitor(srv_monitor_file); rewind(srv_monitor_file);
os_file_set_eof(srv_monitor_file); srv_printf_innodb_monitor(srv_monitor_file);
mutex_exit(&srv_monitor_file_mutex); os_file_set_eof(srv_monitor_file);
mutex_exit(&srv_monitor_file_mutex);
}
if (srv_print_innodb_tablespace_monitor if (srv_print_innodb_tablespace_monitor
&& difftime(current_time, last_table_monitor_time) > 60) { && difftime(current_time, last_table_monitor_time) > 60) {

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

@@ -2369,3 +2369,41 @@ EXPLAIN SELECT i FROM t1 WHERE i=1;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 Using index 1 SIMPLE t1 const PRIMARY PRIMARY 4 const 1 Using index
DROP TABLE t1; 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);
insert into t2 values (1,3), (2,3), (3,4), (4,4);
explain select * from t1 left join t2 on a=c where d in (4);
table type possible_keys key key_len ref rows Extra
t2 ref c,d d 5 const 2 Using where
t1 ALL a NULL NULL NULL 3 Using where
select * from t1 left join t2 on a=c where d in (4);
a b c d
3 2 3 4
4 2 4 4
explain select * from t1 left join t2 on a=c where d = 4;
table type possible_keys key key_len ref rows Extra
t2 ref c,d d 5 const 2 Using where
t1 ALL a NULL NULL NULL 3 Using where
select * from t1 left join t2 on a=c where d = 4;
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;

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

@@ -1898,6 +1898,20 @@ select * from t1,t2 where t1.s = t2.s;
select * from t2,t3 where t2.s = t3.s; select * from t2,t3 where t2.s = t3.s;
drop table t1, t2, t3; drop table t1, t2, t3;
#
# Bug #3759
# Both queries should produce identical plans and results.
#
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);
insert into t2 values (1,3), (2,3), (3,4), (4,4);
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;
# #
# Covering index is mentioned in EXPLAIN output for const tables (bug #5333) # Covering index is mentioned in EXPLAIN output for const tables (bug #5333)
# #

2
scripts/mysql_fix_privilege_tables.sh
View File

@@ -115,7 +115,7 @@ then
password=$old_style_password password=$old_style_password
fi fi
cmd="$bindir/mysql -f --user=$user --host=$host" cmd="$bindir/mysql --no-defaults --force --user=$user --host=$host"
if test ! -z "$password" ; then if test ! -z "$password" ; then
cmd="$cmd --password=$password" cmd="$cmd --password=$password"
fi fi

2
sql/item_cmpfunc.cc
View File

@@ -735,7 +735,7 @@ void Item_func_interval::fix_length_and_dec()
maybe_null= 0; maybe_null= 0;
max_length= 2; max_length= 2;
used_tables_cache|= row->used_tables(); used_tables_cache|= row->used_tables();
not_null_tables_cache&= row->not_null_tables(); not_null_tables_cache= row->not_null_tables();
with_sum_func= with_sum_func || row->with_sum_func; with_sum_func= with_sum_func || row->with_sum_func;
const_item_cache&= row->const_item(); const_item_cache&= row->const_item();
} }

3
sql/slave.cc
View File

@@ -1820,7 +1820,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 position is at the beginning of the file, and will read the
"signature" and then fast-forward to the last position read. "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); my_b_seek(mi->rli.cur_log, (my_off_t) 0);
} }
DBUG_RETURN(0); DBUG_RETURN(0);