diff options
| author | unknown <lenz@mysql.com> | 2004-10-27 21:51:27 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2004-10-27 21:51:27 +0200 |
| commit | 11ff375efd71ac8794aad06c62e6efbbdc6d8165 (patch) | |
| tree | ef3ff402e3597d2f3413b6d105d438f718b8f7a8 /sql/sql_handler.cc | |
| parent | 3bdd7e77fdb66acb4d051dec2b1c4fd136a49f9c (diff) | |
| download | mariadb-git-11ff375efd71ac8794aad06c62e6efbbdc6d8165.tar.gz | |
- Applied some Windows portability fixes for myisampack.c and sql_handler.cc
(backports from fixes made in 4.1)
myisam/myisampack.c:
- replaced "1ULL" with "((ulonglong)1)" to resolve a compile error on
Windows
sql/sql_handler.cc:
- removed some unused variables
- added a (byte*) cast to fix a compile error on Windows (backport of a
fix made in 4.1)
Diffstat (limited to 'sql/sql_handler.cc')
| -rw-r--r-- | sql/sql_handler.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc index 44ffb713dcc..5bfcc897fc7 100644 --- a/sql/sql_handler.cc +++ b/sql/sql_handler.cc @@ -265,8 +265,6 @@ int mysql_ha_close(THD *thd, TABLE_LIST *tables) { TABLE_LIST *hash_tables; TABLE **table_ptr; - bool was_flushed= FALSE; - bool not_opened; DBUG_ENTER("mysql_ha_close"); DBUG_PRINT("enter",("'%s'.'%s' as '%s'", tables->db, tables->real_name, tables->alias)); @@ -363,7 +361,6 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables, int err; int keyno=-1; uint num_rows; - bool was_flushed; MYSQL_LOCK *lock; DBUG_ENTER("mysql_ha_read"); DBUG_PRINT("enter",("'%s'.'%s' as '%s'", @@ -615,10 +612,8 @@ err0: int mysql_ha_flush(THD *thd, TABLE_LIST *tables, uint mode_flags) { - TABLE_LIST **tmp_tables_p; TABLE_LIST *tmp_tables; TABLE **table_ptr; - bool was_flushed; DBUG_ENTER("mysql_ha_flush"); DBUG_PRINT("enter", ("tables: %p mode_flags: 0x%02x", tables, mode_flags)); @@ -692,14 +687,13 @@ static int mysql_ha_flush_table(THD *thd, TABLE **table_ptr, uint mode_flags) { TABLE_LIST *hash_tables; TABLE *table= *table_ptr; - bool was_flushed; DBUG_ENTER("mysql_ha_flush_table"); DBUG_PRINT("enter",("'%s'.'%s' as '%s' flags: 0x%02x", table->table_cache_key, table->real_name, table->table_name, mode_flags)); if ((hash_tables= (TABLE_LIST*) hash_search(&thd->handler_tables_hash, - (*table_ptr)->table_name, + (byte*) (*table_ptr)->table_name, strlen((*table_ptr)->table_name) + 1))) { if (! (mode_flags & MYSQL_HA_REOPEN_ON_USAGE)) |