database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merged with 3.23, needs further fix-up

Browse Source 
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
include/myisam.h:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/deleted/.del-ib_config.h.in~9e57db8504e55b7:
  Auto merged
BitKeeper/deleted/.del-ib_config.h~7539e26ffc614439:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/lex.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
Docs/manual.texi:
  merged
client/errmsg.c:
  merged
configure.in:
  merged
sql/mysqld.cc:
  merged
sql/sql_select.cc:
  merged, needs manual fixing
sql/sql_yacc.yy:
  merged, needs manual fixing
This commit is contained in:
unknown
2001-05-10 15:06:35 -06:00
parent 9afb49f53c b59b5f4b6e
commit 9192600eb7
123 changed files with 3170 additions and 1345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmysql/libmysql.c
View File

@ -16,11 +16,11 @@
MA 02111-1307, USA */
#define DONT_USE_RAID
#include <global.h>
#if defined(__WIN__) || defined(_WIN32) || defined(_WIN64)
#include <winsock.h>
#include <odbcinst.h>
#endif
#include <global.h>
#include <my_sys.h>
#include <mysys_err.h>
#include <m_string.h>