diff options
| author | unknown <msvensson@shellback.> | 2006-04-11 12:19:28 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.> | 2006-04-11 12:19:28 +0200 |
| commit | c73df2254f75a4f9565df55446bb9c75adea10dd (patch) | |
| tree | 80b8074b1996566113c46b23fe7d023918200f51 /sql | |
| parent | 08dd4932ce3d3ef14342b5b7ffd81eb8be4a66c2 (diff) | |
| parent | ea28e412ecac5bf2d6da8b613b68e034fc7ffb3c (diff) | |
| download | mariadb-git-c73df2254f75a4f9565df55446bb9c75adea10dd.tar.gz | |
Merge 192.168.0.10:mysql/mysql-5.1
into shellback.:C:/mysql/my51-bug17368
sql/ha_partition.cc:
Auto merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_partition.cc | 4 | ||||
| -rw-r--r-- | sql/sql_delete.cc | 1 | ||||
| -rw-r--r-- | sql/sql_handler.cc | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 3f74b555f4a..af020511dfd 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -1135,7 +1135,6 @@ int ha_partition::handle_opt_partitions(THD *thd, HA_CHECK_OPT *check_opt, partition_element *part_elem= part_it++; if (all_parts || part_elem->part_state == PART_CHANGED) { - handler *file; if (m_is_sub_partitioned) { List_iterator<partition_element> sub_it(part_elem->subpartitions); @@ -2311,7 +2310,7 @@ int ha_partition::open(const char *name, int mode, uint test_if_locked) err_handler: while (file-- != m_file) (*file)->close(); -err: + DBUG_RETURN(error); } @@ -2915,7 +2914,6 @@ int ha_partition::rnd_init(bool scan) int error; uint i= 0; uint32 part_id; - handler **file; DBUG_ENTER("ha_partition::rnd_init"); include_partition_fields_in_used_fields(); diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 804270992e5..4365d5b04ce 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -870,7 +870,6 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) TABLE *table; bool error; uint closed_log_tables= 0, lock_logger= 0; - TABLE_LIST *tmp_table_list; uint path_length; DBUG_ENTER("mysql_truncate"); diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 9dfa20da522..18b63ba49a3 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -337,7 +337,6 @@ bool mysql_ha_read(THD *thd, TABLE_LIST *tables, ha_rows select_limit_cnt, ha_rows offset_limit_cnt) { TABLE_LIST *hash_tables; - TABLE **table_ptr; TABLE *table; MYSQL_LOCK *lock; List<Item> list; |