diff options
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/derror.cc | 1 | ||||
| -rw-r--r-- | sql/mysql_priv.h | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | sql/sql_bitmap.h | 32 | ||||
| -rw-r--r-- | sql/sql_class.cc | 2 | ||||
| -rw-r--r-- | sql/sql_test.cc | 5 |
6 files changed, 30 insertions, 14 deletions
diff --git a/sql/derror.cc b/sql/derror.cc index 7f4068c487e..f5fe92da238 100644 --- a/sql/derror.cc +++ b/sql/derror.cc @@ -136,6 +136,7 @@ err1: if (file != FERR) VOID(my_close(file,MYF(MY_WME))); unireg_abort(1); + return 1; } /* read_texts */ diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index f7b12bd959c..53cbba36b93 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -15,6 +15,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <my_global.h> +#include <assert.h> #include <mysql_version.h> #include <mysql_embed.h> #include <my_sys.h> @@ -24,7 +25,6 @@ #include <thr_lock.h> #include <my_base.h> /* Needed by field.h */ #include <sql_bitmap.h> -#include <assert.h> #ifdef __EMX__ #undef write /* remove pthread.h macro definition for EMX */ diff --git a/sql/mysqld.cc b/sql/mysqld.cc index fafc67e059d..75e2fc957e4 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1884,7 +1884,7 @@ extern "C" int my_message_sql(uint error, const char *str, if ((thd= current_thd)) { /* - thd->lex.current_select equel to zero if lex structure is not inited + thd->lex.current_select == 0 if lex structure is not inited (not query command (COM_QUERY)) */ if (thd->lex.current_select && diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h index 53293e39591..e5e50c180bf 100644 --- a/sql/sql_bitmap.h +++ b/sql/sql_bitmap.h @@ -1,14 +1,26 @@ -#include <my_global.h> -//#include <mysql_version.h> -//#include <mysql_embed.h> -//#include <my_sys.h> -//#include <m_string.h> -//#include <hash.h> -//#include <signal.h> -//#include <thr_lock.h> -//#include <my_base.h> +/* Copyright (C) 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +/* + Implementation of a bitmap type. + The idea with this is to be able to handle any constant number of bits but + also be able to use 32 or 64 bits bitmaps very efficiently +*/ + #include <my_bitmap.h> -#include <assert.h> template <uint default_width> class Bitmap { diff --git a/sql/sql_class.cc b/sql/sql_class.cc index e5760dda8ae..ed8eaba9128 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -102,6 +102,8 @@ THD::THD():user_time(0), is_fatal_error(0), lock=locked_tables=0; used_tables=0; cuted_fields= sent_row_count= current_stmt_id= 0L; + // Must be reset to handle error with THD's created for init of mysqld + lex.current_select= 0; start_time=(time_t) 0; current_linfo = 0; slave_thread = 0; diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 7e3513367fd..47f0932b221 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -164,10 +164,11 @@ TEST_join(JOIN *join) { JOIN_TAB *tab=join->join_tab+i; TABLE *form=tab->table; - fprintf(DBUG_FILE,"%-16.16s type: %-7s q_keys: %4d refs: %d key: %d len: %d\n", + char key_map_buff[128]; + fprintf(DBUG_FILE,"%-16.16s type: %-7s q_keys: %s refs: %d key: %d len: %d\n", form->table_name, join_type_str[tab->type], - tab->keys, + tab->keys.print(key_map_buff), tab->ref.key_parts, tab->ref.key, tab->ref.key_length); |