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

lots of post-merge changes

Browse Source
This commit is contained in:
Sergei Golubchik
2011-04-25 17:22:25 +02:00
parent 37f87d73ae
commit 0accbd0364
738 changed files with 9206 additions and 10972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/sphinx/snippets_udf.cc
View File

@@ -14,7 +14,6 @@
#include <mysql_version.h>
#if MYSQL_VERSION_ID>50100
#include "mysql_priv.h"
#include <mysql/plugin.h>
#else
#include "../mysql_priv.h"
@@ -30,6 +29,11 @@
#include <mysys_err.h>
#include <my_sys.h>
#include <mysqld_error.h>
#include <my_net.h>
#include <mysql_com.h>
#if MYSQL_VERSION_ID>=50120
typedef uchar byte;
#endif