database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.

Browse Source 
Null-merged patch for bug 53907.

Conflicts:

   conflict      sql/sql_parse.cc
This commit is contained in:
Alexey Kopytov
2010-05-27 14:42:12 +04:00
parent b19c880522 54a006fa0f
commit 17325b8d67
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/my_global.h
View File

@@ -60,6 +60,10 @@
#define USE_PRAGMA_INTERFACE
#endif
#if defined(__OpenBSD__) && (OpenBSD >= 200411)
#define HAVE_ERRNO_AS_DEFINE
#endif
#if defined(i386) && !defined(__i386__)
#define __i386__
#endif

6
sql/net_serv.cc
View File

@@ -16,11 +16,7 @@
/**
@file
This file is the net layer API for the MySQL client/server protocol,
which is a tightly coupled, proprietary protocol owned by MySQL AB.
@note
Any re-implementations of this protocol must also be under GPL
unless one has got an license from MySQL AB stating otherwise.
This file is the net layer API for the MySQL client/server protocol.
Write and read of logical packets to/from socket.