mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Merge with 4.0.11
BitKeeper/etc/gone: auto-union BitKeeper/etc/logging_ok: auto-union Makefile.am: Auto merged bdb/os/os_handle.c: Auto merged client/mysqladmin.c: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged extra/resolveip.c: Auto merged include/Makefile.am: Auto merged include/config-win.h: Auto merged include/my_base.h: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/mysql.h: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/os/os0file.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged libmysql/Makefile.am: Auto merged libmysql/Makefile.shared: Auto merged libmysql/manager.c: Auto merged libmysqld/libmysqld.c: Auto merged myisam/ft_static.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_test3.c: Auto merged myisam/myisamdef.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/func_math.result: Auto merged mysql-test/r/handler.result: Auto merged mysql-test/r/query_cache.result: Auto merged mysql-test/r/select_found.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/backup.test: Auto merged mysql-test/t/bigint.test: Auto merged mysql-test/t/binary.test: Auto merged mysql-test/t/count_distinct.test: Auto merged mysql-test/t/func_crypt.test: Auto merged mysql-test/t/func_group.test: Auto merged mysql-test/t/grant_cache.test: Auto merged mysql-test/t/handler.test: Auto merged mysql-test/t/query_cache.test: Auto merged mysql-test/t/rpl000015.test: Auto merged mysql-test/t/rpl000017.test: Auto merged mysys/default.c: Auto merged mysys/my_getwd.c: Auto merged mysys/my_init.c: Auto merged sql/Makefile.am: Auto merged sql/des_key_file.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.cc: Auto merged sql/handler.cc: Auto merged sql/hostname.cc: Auto merged sql/item.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/lex.h: Auto merged sql/net_serv.cc: Auto merged sql/opt_sum.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_udf.cc: Auto merged sql-bench/crash-me.sh: Auto merged sql-bench/server-cfg.sh: Auto merged sql-bench/test-insert.sh: Auto merged sql/share/english/errmsg.txt: Auto merged sql/table.cc: Auto merged Docs/manual.texi: Use remote version client/mysql.cc: Merge configure.in: Merge libmysql/libmysql.c: Merge libmysqld/lib_sql.cc: Merge myisam/ft_stopwords.c: Merge myisam/myisamchk.c: Merge mysql-test/r/bigint.result: Merge mysql-test/r/group_by.result: Merge mysql-test/r/rpl000009.result: Merge mysql-test/t/group_by.test: Merge mysql-test/t/rpl000009.test: Merge mysql-test/t/rpl_rotate_logs.test: Merge mysys/Makefile.am: Merge mysys/charset.c: Merge sql/item.h: Merge sql/item_cmpfunc.cc: Merge sql/item_cmpfunc.h: Merge sql/item_create.cc: Merge sql/item_func.cc: Merge sql/item_strfunc.h: Merge sql/log.cc: Merge sql/mysql_priv.h: Merge sql/mysqld.cc: Merge sql/protocol.cc: Merge sql/slave.cc: Merge sql/sql_class.h: Merge sql/sql_db.cc: Merge sql/sql_handler.cc: Merge sql/sql_parse.cc: Merge sql/sql_select.cc: Merge sql/sql_yacc.yy: Merge
This commit is contained in:
unknown
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
||||
/* Copyright (C) 2000-2003 MySQL AB
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -22,28 +22,55 @@
|
||||
|
||||
static bool find_range_key(TABLE_REF *ref, Field* field,COND *cond);
|
||||
|
||||
/*****************************************************************************
|
||||
** This function is only called for queries with sum functions and no
|
||||
** GROUP BY part.
|
||||
** This substitutes constants for some COUNT(), MIN() and MAX() functions.
|
||||
** The function returns 1 if all items was resolved and -1 on impossible
|
||||
** conditions
|
||||
****************************************************************************/
|
||||
/*
|
||||
Substitutes constants for some COUNT(), MIN() and MAX() functions.
|
||||
|
||||
SYNOPSIS
|
||||
opt_sum_query()
|
||||
tables Tables in query
|
||||
all_fields All fields to be returned
|
||||
conds WHERE clause
|
||||
|
||||
NOTE:
|
||||
This function is only called for queries with sum functions and no
|
||||
GROUP BY part.
|
||||
|
||||
RETURN VALUES
|
||||
0 No errors
|
||||
1 if all items was resolved
|
||||
-1 on impossible conditions
|
||||
*/
|
||||
|
||||
int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
|
||||
{
|
||||
List_iterator_fast<Item> it(all_fields);
|
||||
int const_result=1;
|
||||
bool recalc_const_item=0;
|
||||
table_map removed_tables=0;
|
||||
int const_result= 1;
|
||||
bool recalc_const_item= 0;
|
||||
table_map removed_tables= 0, outer_tables= 0, used_tables= 0;
|
||||
table_map where_tables= 0;
|
||||
Item *item;
|
||||
COND *org_conds= conds;
|
||||
|
||||
/* Add all ON conditions to WHERE condition */
|
||||
if (conds)
|
||||
where_tables= conds->used_tables();
|
||||
|
||||
/* Don't replace expression on a table that is part of an outer join */
|
||||
for (TABLE_LIST *tl=tables; tl ; tl= tl->next)
|
||||
{
|
||||
if (tl->on_expr)
|
||||
conds= and_expressions(conds, tl->on_expr, &org_conds);
|
||||
{
|
||||
outer_tables|= tl->table->map;
|
||||
|
||||
/*
|
||||
We can't optimise LEFT JOIN in cases where the WHERE condition
|
||||
restricts the table that is used, like in:
|
||||
SELECT MAX(t1.a) FROM t1 LEFT JOIN t2 join-condition
|
||||
WHERE t2.field IS NULL;
|
||||
*/
|
||||
if (tl->table->map & where_tables)
|
||||
return 0;
|
||||
}
|
||||
used_tables|= tl->table->map;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -68,8 +95,8 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
|
||||
TABLE_LIST *table;
|
||||
for (table=tables; table ; table=table->next)
|
||||
{
|
||||
if (table->on_expr || (table->table->file->table_flags() &
|
||||
HA_NOT_EXACT_COUNT))
|
||||
if (outer_tables || (table->table->file->table_flags() &
|
||||
HA_NOT_EXACT_COUNT))
|
||||
{
|
||||
const_result=0; // Can't optimize left join
|
||||
break;
|
||||
@ -99,21 +126,35 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
|
||||
byte key_buff[MAX_KEY_LENGTH];
|
||||
TABLE_REF ref;
|
||||
ref.key_buff=key_buff;
|
||||
Item_field *item_field= ((Item_field*) expr);
|
||||
TABLE *table= item_field->field->table;
|
||||
|
||||
if (!find_range_key(&ref, ((Item_field*) expr)->field,conds))
|
||||
if ((outer_tables & table->map) ||
|
||||
(!find_range_key(&ref, item_field->field,conds)))
|
||||
{
|
||||
const_result=0;
|
||||
break;
|
||||
}
|
||||
TABLE *table=((Item_field*) expr)->field->table;
|
||||
bool error=table->file->index_init((uint) ref.key);
|
||||
bool error= table->file->index_init((uint) ref.key);
|
||||
enum ha_rkey_function find_flag= HA_READ_KEY_OR_NEXT;
|
||||
uint prefix_len= ref.key_length;
|
||||
/*
|
||||
If we are doing MIN() on a column with NULL fields
|
||||
we must read the key after the NULL column
|
||||
*/
|
||||
if (item_field->field->null_bit)
|
||||
{
|
||||
ref.key_buff[ref.key_length++]=1;
|
||||
find_flag= HA_READ_AFTER_KEY;
|
||||
}
|
||||
|
||||
if (!ref.key_length)
|
||||
error=table->file->index_first(table->record[0]) !=0;
|
||||
else
|
||||
error=table->file->index_read(table->record[0],key_buff,
|
||||
ref.key_length,
|
||||
HA_READ_KEY_OR_NEXT) ||
|
||||
key_cmp(table, key_buff, ref.key, ref.key_length);
|
||||
find_flag) ||
|
||||
key_cmp(table, key_buff, ref.key, prefix_len);
|
||||
if (table->key_read)
|
||||
{
|
||||
table->key_read=0;
|
||||
@ -121,7 +162,7 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
|
||||
}
|
||||
table->file->index_end();
|
||||
if (error)
|
||||
return -1; // Impossible query
|
||||
return -1; // No rows matching where
|
||||
removed_tables|= table->map;
|
||||
}
|
||||
else if (!expr->const_item()) // This is VERY seldom false
|
||||
@ -147,13 +188,14 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
|
||||
byte key_buff[MAX_KEY_LENGTH];
|
||||
TABLE_REF ref;
|
||||
ref.key_buff=key_buff;
|
||||
TABLE *table=((Item_field*) expr)->field->table;
|
||||
|
||||
if (!find_range_key(&ref, ((Item_field*) expr)->field,conds))
|
||||
if ((outer_tables & table->map) ||
|
||||
!find_range_key(&ref, ((Item_field*) expr)->field,conds))
|
||||
{
|
||||
const_result=0;
|
||||
break;
|
||||
}
|
||||
TABLE *table=((Item_field*) expr)->field->table;
|
||||
if ((table->file->table_flags() & HA_NOT_READ_AFTER_KEY))
|
||||
{
|
||||
const_result=0;
|
||||
@ -203,8 +245,8 @@ int opt_sum_query(TABLE_LIST *tables, List<Item> &all_fields,COND *conds)
|
||||
const_result=0;
|
||||
}
|
||||
}
|
||||
if (conds && (conds->used_tables() & ~ removed_tables))
|
||||
const_result=0;
|
||||
if (used_tables != removed_tables)
|
||||
const_result=0; // We didn't remove all tables
|
||||
return const_result;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user