From db7af023c09b8d01a3115eb9b0150584e10d552b Mon Sep 17 00:00:00 2001
From: "malff/marcsql@weblab.(none)" <>
Date: Fri, 27 Jul 2007 12:30:02 -0600
Subject: [PATCH] manual merge

---
 sql/table.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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")};