manual merge

db7af023 · malff/marcsql@weblab.(none) · 32668a2e · db7af023
Commit db7af023 authored Jul 27, 2007 by malff/marcsql@weblab.(none)
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/table.cc sql/table.cc +1 -1

No files found.
--- 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")};