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

Enable C++11

Browse Source
This commit is contained in:
Sergey Vojtovich
2018-05-29 21:46:31 +04:00
parent 96572b7aa1
commit d9613b750c
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -77,6 +77,14 @@ ELSE()
ENDIF() ENDIF()
PROJECT(${MYSQL_PROJECT_NAME}) PROJECT(${MYSQL_PROJECT_NAME})
IF(CMAKE_VERSION VERSION_LESS "3.1")
IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
ENDIF()
ELSE()
SET(CMAKE_CXX_STANDARD 11)
ENDIF()
SET(CPACK_PACKAGE_NAME "MariaDB") SET(CPACK_PACKAGE_NAME "MariaDB")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB: a very fast and robust SQL database server") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB: a very fast and robust SQL database server")
SET(CPACK_PACKAGE_URL "http://mariadb.org") SET(CPACK_PACKAGE_URL "http://mariadb.org")

2
include/m_string.h
View File

@@ -99,7 +99,7 @@ extern char *strmake(char *dst,const char *src,size_t length);
#define strmake_buf(D,S) strmake(D, S, sizeof(D) - 1) #define strmake_buf(D,S) strmake(D, S, sizeof(D) - 1)
#else #else
#define strmake_buf(D,S) ({ \ #define strmake_buf(D,S) ({ \
typeof (D) __x __attribute__((unused)) = { 2 }; \ __typeof__ (D) __x __attribute__((unused)) = { 2 }; \
strmake(D, S, sizeof(D) - 1); \ strmake(D, S, sizeof(D) - 1); \
}) })
#endif #endif

7
sql/table.cc
View File

@@ -44,6 +44,7 @@
#include "sql_cte.h" #include "sql_cte.h"
#include "ha_sequence.h" #include "ha_sequence.h"
#include "sql_show.h" #include "sql_show.h"
#include <atomic>
/* For MySQL 5.7 virtual fields */ /* For MySQL 5.7 virtual fields */
#define MYSQL57_GENERATED_FIELD 128 #define MYSQL57_GENERATED_FIELD 128
@@ -79,7 +80,7 @@ LEX_CSTRING MYSQL_PROC_NAME= {STRING_WITH_LEN("proc")};
*/ */
static LEX_CSTRING parse_vcol_keyword= { STRING_WITH_LEN("PARSE_VCOL_EXPR ") }; static LEX_CSTRING parse_vcol_keyword= { STRING_WITH_LEN("PARSE_VCOL_EXPR ") };
static int64 last_table_id; static std::atomic<ulong> last_table_id;
/* Functions defined in this file */ /* Functions defined in this file */
@@ -343,8 +344,8 @@ TABLE_SHARE *alloc_table_share(const char *db, const char *table_name,
*/ */
do do
{ {
share->table_map_id=(ulong) my_atomic_add64_explicit(&last_table_id, 1, share->table_map_id=
MY_MEMORY_ORDER_RELAXED); last_table_id.fetch_add(1, std::memory_order_relaxed);
} while (unlikely(share->table_map_id == ~0UL)); } while (unlikely(share->table_map_id == ~0UL));
} }
DBUG_RETURN(share); DBUG_RETURN(share);

2
storage/tokudb/PerconaFT/portability/toku_crash.cc
View File

@@ -70,7 +70,7 @@ run_gdb(pid_t parent_pid, const char *gdb_path) {
"-ex", "thread apply all bt", "-ex", "thread apply all bt",
"-ex", "thread apply all bt full", "-ex", "thread apply all bt full",
exe_buf, pid_buf, exe_buf, pid_buf,
NULL); (char*) NULL);
} }
static void static void