summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-11-27 02:28:41 +0200
committerunknown <monty@donna.mysql.com>2000-11-27 02:28:41 +0200
commit1b337e01d5d0a97b3a66eb98bcad658cfecb65b6 (patch)
treeedb54aec005b494e1195e3b4c62ef7b81153a705 /sql/sql_select.cc
parentc754d3318624c31e84772edb7d053da4628fd7ca (diff)
downloadmariadb-git-1b337e01d5d0a97b3a66eb98bcad658cfecb65b6.tar.gz
Added connect_timeout and fix for transactions per statement
BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.12_20smp_i686: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-mysql-Linux_2.2.1_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-pg-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.12_20smp_i686: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql-Linux_2.2.1_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-pg-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.12_20smp_i686: ***MISSING WEAVE*** BitKeeper/deleted/.del-alter-table-mysql-Linux_2.2.1_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-alter-table-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-alter-table-pg-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-alter-table-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.12_20smp_i686: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql-Linux_2.2.1_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-pg-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql-Linux_2.2.12_20smp_i686: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql-Linux_2.2.1_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-pg-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql-Linux_2.2.12_20smp_i686: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql-Linux_2.2.1_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-pg-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql-Linux_2.2.12_20smp_i686: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql-Linux_2.2.1_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-pg-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql-Linux_2.2.12_20smp_i686: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql-Linux_2.2.1_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-pg-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.12_20smp_i686: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.2.1_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-pg-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-pg_fast-Linux_2.2.10_i686-cmp-mysql,pg: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-mysql-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-mysql-Linux_dynamic: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-mysql-Linux_pgcc: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-mysql-Linux_static: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-mysql_fast-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-mysql_local_tcp-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-ATIS-mysql_new-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql-Linux_dynamic: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql-Linux_pgcc: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql-Linux_static: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql_fast-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql_local_tcp-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-RUN-mysql_new-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql-Linux_dynamic: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql-Linux_pgcc: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql-Linux_static: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql_fast-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql_local_tcp-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-big-tables-mysql_new-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql-Linux_dynamic: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql-Linux_pgcc: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql-Linux_static: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql_fast-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql_local_tcp-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-connect-mysql_new-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql-Linux_dynamic: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql-Linux_pgcc: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql-Linux_static: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql_fast-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql_local_tcp-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-create-mysql_new-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql-Linux_dynamic: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql-Linux_pgcc: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql-Linux_static: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql_fast-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql_local_tcp-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-insert-mysql_new-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql-Linux_dynamic: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql-Linux_pgcc: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql-Linux_static: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql_fast-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql_local_tcp-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-select-mysql_new-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql-Linux_dynamic: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql-Linux_pgcc: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql-Linux_static: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql_fast-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql_local_tcp-Linux_2.0.33_i586: ***MISSING WEAVE*** BitKeeper/deleted/.del-wisconsin-mysql_new-Linux_2.0.33_i586: ***MISSING WEAVE*** Docs/Makefile.am: Removed manual.pdf from the standard distribution Docs/manual.texi: Updated table maintaince and timeouts Makefile.am: Added missing targets client/mysql.cc: Added -O connect_timeout client/mysqladmin.c: Added -O connect_timeout configure.in: 3.23.29 libmysql/libmysql.c: Added connect_timeout myisam/mi_check.c: Fixed warning i CHECK TABLE myisam/mi_create.c: cleanup sql-bench/bench-init.pl.sh: Updated version sql/ha_berkeley.cc: Fixed bug in transaction pre statement sql/sql_select.cc: removed 'explain' from slow query log support-files/mysql.server.sh: Added locks
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc15
1 files changed, 9 insertions, 6 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 7e668d60876..29ef01e8196 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -138,7 +138,7 @@ static void init_sum_functions(Item_sum **func);
static bool update_sum_func(Item_sum **func);
static void select_describe(JOIN *join, bool need_tmp_table, bool need_order,
bool distinct);
-static void describe_info(const char *info);
+static void describe_info(THD *thd, const char *info);
/*****************************************************************************
** check fields, find best join, do the select and output fields.
@@ -336,7 +336,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
}
if (select_options & SELECT_DESCRIBE)
{
- describe_info("Select tables optimized away");
+ describe_info(thd,"Select tables optimized away");
delete procedure;
DBUG_RETURN(0);
}
@@ -347,7 +347,7 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds,
{ // Only test of functions
error=0;
if (select_options & SELECT_DESCRIBE)
- describe_info("No tables used");
+ describe_info(thd,"No tables used");
else
{
result->send_fields(fields,1);
@@ -2726,7 +2726,7 @@ return_zero_rows(select_result *result,TABLE_LIST *tables,List<Item> &fields,
if (select_options & SELECT_DESCRIBE)
{
- describe_info(info);
+ describe_info(current_thd, info);
DBUG_RETURN(0);
}
if (procedure)
@@ -6421,6 +6421,8 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order,
THD *thd=join->thd;
DBUG_ENTER("select_describe");
+ /* Don't log this into the slow query log */
+ join->thd->lex.options&= ~(QUERY_NO_INDEX_USED | QUERY_NO_GOOD_INDEX_USED);
field_list.push_back(new Item_empty_string("table",NAME_LEN));
field_list.push_back(new Item_empty_string("type",10));
field_list.push_back(item=new Item_empty_string("possible_keys",
@@ -6573,12 +6575,13 @@ static void select_describe(JOIN *join, bool need_tmp_table, bool need_order,
}
-static void describe_info(const char *info)
+static void describe_info(THD *thd, const char *info)
{
List<Item> field_list;
- THD *thd=current_thd;
String *packet= &thd->packet;
+ /* Don't log this into the slow query log */
+ thd->lex.options&= ~(QUERY_NO_INDEX_USED | QUERY_NO_GOOD_INDEX_USED);
field_list.push_back(new Item_empty_string("Comment",80));
if (send_fields(thd,field_list,1))
return; /* purecov: inspected */
View Lorry Controller Status