diff options
| author | mskold@mysql.com <> | 2005-01-11 14:06:44 +0100 |
|---|---|---|
| committer | mskold@mysql.com <> | 2005-01-11 14:06:44 +0100 |
| commit | e72f9108efe44d7ae666d0016b22533784f6c293 (patch) | |
| tree | 6cd71437fc9ecb414836e50c683a511d083c9885 | |
| parent | 20184b7047c36a95d87eee8e02134ca6cfcaa179 (diff) | |
| download | mariadb-git-e72f9108efe44d7ae666d0016b22533784f6c293.tar.gz | |
Removed compiler warnings
| -rw-r--r-- | sql/ha_ndbcluster.cc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index b1fbe392940..d21237a0719 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -2266,7 +2266,7 @@ void ha_ndbcluster::print_results() char buf[2000]; Field *field; void* ptr; - const NDBCOL *col; + const NDBCOL *col= NULL; NdbValue value; NdbBlob *ndb_blob; @@ -4008,7 +4008,6 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg): handler(table_arg), m_active_trans(NULL), m_active_cursor(NULL), - m_multi_cursor(NULL), m_table(NULL), m_table_info(NULL), m_table_flags(HA_REC_NOT_IN_SEQ | @@ -4037,7 +4036,8 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg): m_force_send(TRUE), m_autoincrement_prefetch(32), m_transaction_on(TRUE), - m_use_local_query_cache(FALSE) + m_use_local_query_cache(FALSE), + m_multi_cursor(NULL) { int i; @@ -5059,8 +5059,9 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p, * pk-op 4 pk-op 4 * range 5 * pk-op 6 pk-ok 6 - - /** + */ + + /** * Variables for loop */ byte *curr= (byte*)buffer->buffer; @@ -5117,7 +5118,7 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p, multi_range_curr->start_key.length)) goto sk; goto range; - case ORDERED_INDEX: + case ORDERED_INDEX: { range: multi_range_curr->range_flag &= ~(uint)UNIQUE_RANGE; if (scanOp == 0) @@ -5152,6 +5153,11 @@ ha_ndbcluster::read_multi_range_first(KEY_MULTI_RANGE **found_range_p, DBUG_RETURN(res); break; } + case(UNDEFINED_INDEX): + DBUG_ASSERT(FALSE); + DBUG_RETURN(1); + break; + } } if (multi_range_curr != multi_range_end) @@ -5238,7 +5244,7 @@ ha_ndbcluster::read_multi_range_next(KEY_MULTI_RANGE ** multi_range_found_p) range_no= m_multi_cursor->get_range_no(); uint current_range_no= multi_range_curr - m_multi_ranges; - if (range_no == current_range_no) + if ((uint) range_no == current_range_no) { DBUG_MULTI_RANGE(4); // return current row |