summaryrefslogtreecommitdiff
path: root/sql/ha_myisam.cc
diff options
context:
space:
mode:
authorhf@deer.mysql.r18.ru <>2002-12-16 17:33:29 +0400
committerhf@deer.mysql.r18.ru <>2002-12-16 17:33:29 +0400
commite3b3b6830788d1a318df452e3c11956347392e0a (patch)
treeac62ff3cde5a13932e6d512787093827232af630 /sql/ha_myisam.cc
parent3517febe97fcea4b90f42da0630cd376425026ab (diff)
downloadmariadb-git-e3b3b6830788d1a318df452e3c11956347392e0a.tar.gz
Big purge about embedded library (scrum)
Diffstat (limited to 'sql/ha_myisam.cc')
-rw-r--r--sql/ha_myisam.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index 4d169ea5d91..5cf77698e6b 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -62,11 +62,14 @@ static void mi_check_print_msg(MI_CHECK *param, const char* msg_type,
DBUG_PRINT(msg_type,("message: %s",msgbuf));
+#ifndef EMBEDDED_LIBRARY
if (thd->net.vio == 0)
{
sql_print_error(msgbuf);
return;
}
+#endif
+
if (param->testflag & (T_CREATE_MISSING_KEYS | T_SAFE_REPAIR | T_AUTO_REPAIR))
{
my_message(ER_NOT_KEYFILE,msgbuf,MYF(MY_WME));
@@ -139,6 +142,7 @@ const char *ha_myisam::index_type(uint key_number)
int ha_myisam::net_read_dump(NET* net)
{
+#ifndef EMBEDDED_LIBRARY
int data_fd = file->dfile;
int error = 0;
@@ -161,14 +165,17 @@ int ha_myisam::net_read_dump(NET* net)
goto err;
}
}
-
err:
return error;
+#else
+ return (int)net;
+#endif
}
int ha_myisam::dump(THD* thd, int fd)
{
+#ifndef EMBEDDED_LIBRARY
MYISAM_SHARE* share = file->s;
NET* net = &thd->net;
uint blocksize = share->blocksize;
@@ -217,6 +224,9 @@ int ha_myisam::dump(THD* thd, int fd)
err:
my_free((gptr) buf, MYF(0));
return error;
+#else
+ return (int)thd - fd;
+#endif
}
/* Name is here without an extension */