summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_myisam.cc1
-rw-r--r--sql/sql_base.cc3
2 files changed, 1 insertions, 3 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index 8536aa5219c..ca9f58628e1 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -111,7 +111,6 @@ const char **ha_myisam::bas_ext() const
int ha_myisam::net_read_dump(NET* net)
{
- MYISAM_SHARE* share = file->s;
int data_fd = file->dfile;
int error = 0;
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index de689baaddb..84213a26b94 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -47,7 +47,6 @@ static int send_file(THD *thd)
{
NET* net = &thd->net;
int fd = -1,bytes, error = 1;
- uint packet_len;
char fname[FN_REFLEN+1];
char buf[IO_SIZE*15];
const char *errmsg = 0;
@@ -61,7 +60,7 @@ static int send_file(THD *thd)
// we need net_flush here because the client will not know it needs to send
// us the file name until it has processed the load event entry
- if (net_flush(net) || (packet_len = my_net_read(net)) == packet_error)
+ if (net_flush(net) || my_net_read(net) == packet_error)
{
errmsg = "Failed reading file name";
goto err;