database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-5314 - Compiling fails on OSX using clang

Browse Source 
This is port of fix for MySQL BUG#17647863.

revno: 5572
revision-id: jon.hauglid@oracle.com-20131030232243-b0pw98oy72uka2sj
committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
timestamp: Thu 2013-10-31 00:22:43 +0100
message:
  Bug#17647863: MYSQL DOES NOT COMPILE ON OSX 10.9 GM

  Rename test() macro to MY_TEST() to avoid conflict with libc++.
This commit is contained in:
Sergey Vojtovich
2014-02-19 14:05:15 +04:00
parent fd1437dfe5
commit d12c7adf71
133 changed files with 600 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_prepare.h
View File

@ -290,7 +290,7 @@ public:
one.
Never fails.
*/
bool has_next_result() const { return test(m_current_rset->m_next_rset); }
bool has_next_result() const { return MY_TEST(m_current_rset->m_next_rset); }
/**
Only valid to call if has_next_result() returned true.
Otherwise the result is undefined.
@ -298,7 +298,7 @@ public:
bool move_to_next_result()
{
m_current_rset= m_current_rset->m_next_rset;
return test(m_current_rset);
return MY_TEST(m_current_rset);
}
~Ed_connection() { free_old_result(); }