1
0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00

Merge mashka.mysql.fi:/home/my/mysql-3.23

into mashka.mysql.fi:/home/my/mysql-4.0


Docs/manual.texi:
  Auto merged
mysql-test/r/distinct.result:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
This commit is contained in:
unknown
2002-09-03 16:50:59 +03:00
3 changed files with 8 additions and 0 deletions

View File

@@ -19,6 +19,9 @@
#include "mysql_priv.h"
#include <hash.h>
#ifdef HAVE_BERKELEY_DB
#include <ha_berkeley.h>
#endif
#include <myisam.h>
#ifdef HAVE_BERKELEY_DB
#include <ha_berkeley.h>