diff options
author | unknown <jimw@mysql.com> | 2005-06-18 01:55:42 +0200 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-06-18 01:55:42 +0200 |
commit | 94d1d88658e5aa75d999c308ac464014f20a3d02 (patch) | |
tree | 076bb703eac95ae156980bf3eda38b417ad59e5e /sql/ha_federated.cc | |
parent | 0945dea8d08b13189691052b79fe2bd255e0f008 (diff) | |
download | mariadb-git-94d1d88658e5aa75d999c308ac464014f20a3d02.tar.gz |
Clean up warnings and build problems on Windows. (Bug #11045)
VC++Files/sql/mysqld.dsp:
Link debug server against debug yassl
sql/examples/ha_archive.cc:
Fix type for variables used to store number of rows
Add cast when reading current position
sql/examples/ha_archive.h:
Fix variables used to store rows to ha_rows
sql/ha_federated.cc:
Remove unused variables, fix type of variable used to store query id
sql/item_strfunc.cc:
Remove unused variables
sql/sql_acl.cc:
Remove unused variables
sql/sql_lex.cc:
Add casts to fix type used for counting number of rows
sql/sql_lex.h:
Fix size of options to be ulong again
sql/sql_insert.cc:
Fix type of query id value
sql/sql_union.cc:
Cast value for number of rows to ha_rows
sql/sql_yacc.yy:
Remove unused variable
sql/table.cc:
Add casts for handling key_part lengths
Diffstat (limited to 'sql/ha_federated.cc')
-rw-r--r-- | sql/ha_federated.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index 89210a2f3cd..bf6674cf5cd 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -842,7 +842,7 @@ static FEDERATED_SHARE *get_share(const char *table_name, TABLE *table) query.length(0); uint table_name_length, table_base_name_length; - char *tmp_table_name, *tmp_table_base_name, *table_base_name, *select_query; + char *tmp_table_name, *table_base_name, *select_query; /* share->table_name has the file location - we want the table's name! */ table_base_name= (char*) table->s->table_name; @@ -963,7 +963,6 @@ const char **ha_federated::bas_ext() const int ha_federated::open(const char *name, int mode, uint test_if_locked) { - int rc; DBUG_ENTER("ha_federated::open"); if (!(share= get_share(name, table))) @@ -1076,7 +1075,7 @@ int ha_federated::write_row(byte *buf) { uint x= 0, num_fields= 0; Field **field; - ulong current_query_id= 1; + query_id_it current_query_id= 1; ulong tmp_query_id= 1; uint all_fields_have_same_query_id= 1; @@ -1471,8 +1470,6 @@ int ha_federated::index_read_idx(byte *buf, uint index, const byte *key, __attribute__ ((unused))) { char index_value[IO_SIZE]; - char key_value[IO_SIZE]; - char test_value[IO_SIZE]; String index_string(index_value, sizeof(index_value), &my_charset_bin); index_string.length(0); uint keylen; @@ -1538,7 +1535,6 @@ int ha_federated::index_read_idx(byte *buf, uint index, const byte *key, /* Initialized at each key walk (called multiple times unlike rnd_init()) */ int ha_federated::index_init(uint keynr) { - int error; DBUG_ENTER("ha_federated::index_init"); DBUG_PRINT("info", ("table: '%s' key: %d", table->s->table_name, keynr)); @@ -1570,7 +1566,6 @@ int ha_federated::index_next(byte *buf) int ha_federated::rnd_init(bool scan) { DBUG_ENTER("ha_federated::rnd_init"); - int num_fields, rows; /* This 'scan' flag is incredibly important for this handler to work |