summaryrefslogtreecommitdiff
path: root/sql/table.cc
diff options
context:
space:
mode:
authorunknown <malff/marcsql@weblab.(none)>2007-07-27 12:30:02 -0600
committerunknown <malff/marcsql@weblab.(none)>2007-07-27 12:30:02 -0600
commit2e23c6f09051ba86fe46d471cc37628097b8c367 (patch)
tree2658df239fa14e2421bd070b412617213d23bc45 /sql/table.cc
parentced93a5cc8fb3822e63a20359aa68cc54ffb2d4a (diff)
downloadmariadb-git-2e23c6f09051ba86fe46d471cc37628097b8c367.tar.gz
manual merge
Diffstat (limited to 'sql/table.cc')
-rw-r--r--sql/table.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc
index fef63170ea6..b3d49830149 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -19,7 +19,7 @@
#include "mysql_priv.h"
#include "sql_trigger.h"
#include <m_ctype.h>
-#include "md5.h"
+#include "my_md5.h"
/* INFORMATION_SCHEMA name */
LEX_STRING INFORMATION_SCHEMA_NAME= {C_STRING_WITH_LEN("information_schema")};