diff options
author | unknown <monty@hundin.mysql.fi> | 2002-08-23 15:14:01 +0300 |
---|---|---|
committer | unknown <monty@hundin.mysql.fi> | 2002-08-23 15:14:01 +0300 |
commit | 41abdd90cc3bae76131022f99090d259bf111426 (patch) | |
tree | bca567751e08d245abe17e089c4c522b91c2dbe8 /sql/sql_select.cc | |
parent | 915aaa1805b4828196e3e96601f58b460122e7c2 (diff) | |
download | mariadb-git-41abdd90cc3bae76131022f99090d259bf111426.tar.gz |
Changed relay_log_space to ulonglong
Removed compiler warnings.
Build-tools/Do-compile:
Simple cleanup
include/mysql.h:
Use #include "" instead of include <>
mysql-test/t/innodb_handler.test:
Documented test
Change to be runnable from mysql
sql/mini_client.cc:
Removed dead code
sql/mysqld.cc:
Changed relay_log_space to ulonglong
sql/slave.cc:
Changed relay_log_space to ulonglong
Removed dead code
sql/slave.h:
Changed relay_log_space to ulonglong
sql/sql_acl.cc:
Removed not used variables
sql/sql_base.cc:
Removed not used variables
sql/sql_cache.cc:
Removed not used variables
sql/sql_select.cc:
Removed not used variables
vio/vio.c:
Re-order include files to remove compiler warnings
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r-- | sql/sql_select.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 6adf680b6f1..11b89722017 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -214,7 +214,6 @@ mysql_select(THD *thd,TABLE_LIST *tables,List<Item> &fields,COND *conds, Procedure *procedure; List<Item> all_fields(fields); bool select_distinct; - SELECT_LEX *select_lex = &(thd->lex.select_lex); SELECT_LEX *cur_sel = thd->lex.select; DBUG_ENTER("mysql_select"); @@ -4277,7 +4276,7 @@ do_select(JOIN *join,List<Item> *fields,TABLE *table,Procedure *procedure) } if (table) { - int old_error=error,tmp; + int tmp; if ((tmp=table->file->extra(HA_EXTRA_NO_CACHE))) { my_errno=tmp; |