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

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2015-05-08 11:20:43 +02:00
parent a1ad712152 0014bdc7ee
commit ac286a9bc7
7 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/repair.result
View File

@ -207,3 +207,10 @@ check table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check status OK test.t1 check status OK
drop table t1; drop table t1;
create table t1 (a blob);
create view v1 as select * from t1;
repair view v1;
Table Op Msg_type Msg_text
test.v1 repair status OK
drop view v1;
drop table t1;

9
mysql-test/t/repair.test
View File

@ -210,3 +210,12 @@ repair table t1 use_frm;
select count(*) from t1; select count(*) from t1;
check table t1; check table t1;
drop table t1; drop table t1;
#
# MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEW
#
create table t1 (a blob);
create view v1 as select * from t1;
repair view v1;
drop view v1;
drop table t1;

2
sql/sql_admin.cc
View File

@ -1012,7 +1012,7 @@ send_result_message:
break; break;
} }
} }
if (table->table) if (table->table && !table->view)
{ {
if (table->table->s->tmp_table) if (table->table->s->tmp_table)
{ {

2
storage/innobase/CMakeLists.txt
View File

@ -199,6 +199,8 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1) ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1)
ENDIF() ENDIF()
CHECK_C_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
ENDIF(NOT MSVC) ENDIF(NOT MSVC)
CHECK_FUNCTION_EXISTS(asprintf HAVE_ASPRINTF) CHECK_FUNCTION_EXISTS(asprintf HAVE_ASPRINTF)

7
storage/innobase/handler/i_s.cc
View File

@ -157,9 +157,12 @@ do { \
} \ } \
} while (0) } while (0)
#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && \ #if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && !defined __INTEL_COMPILER && !defined __clang__
!defined __INTEL_COMPILER && !defined __clang__ #ifdef HAVE_C99_INITIALIZERS
#define STRUCT_FLD(name, value) .name = value
#else
#define STRUCT_FLD(name, value) name: value #define STRUCT_FLD(name, value) name: value
#endif /* HAVE_C99_INITIALIZERS */
#else #else
#define STRUCT_FLD(name, value) value #define STRUCT_FLD(name, value) value
#endif #endif

2
storage/xtradb/CMakeLists.txt
View File

@ -206,6 +206,8 @@ IF(HAVE_IB_ATOMIC_PTHREAD_T_GCC)
ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1) ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_GCC=1)
ENDIF() ENDIF()
CHECK_C_SOURCE_COMPILES("struct t1{ int a; char *b; }; struct t1 c= { .a=1, .b=0 }; main() { }" HAVE_C99_INITIALIZERS)
ENDIF(NOT MSVC) ENDIF(NOT MSVC)
CHECK_FUNCTION_EXISTS(asprintf HAVE_ASPRINTF) CHECK_FUNCTION_EXISTS(asprintf HAVE_ASPRINTF)

7
storage/xtradb/handler/i_s.cc
View File

@ -169,9 +169,12 @@ do { \
} \ } \
} while (0) } while (0)
#if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && \ #if !defined __STRICT_ANSI__ && defined __GNUC__ && (__GNUC__) > 2 && !defined __INTEL_COMPILER && !defined __clang__
!defined __INTEL_COMPILER && !defined __clang__ #ifdef HAVE_C99_INITIALIZERS
#define STRUCT_FLD(name, value) .name = value
#else
#define STRUCT_FLD(name, value) name: value #define STRUCT_FLD(name, value) name: value
#endif /* HAVE_C99_INITIALIZERS */
#else #else
#define STRUCT_FLD(name, value) value #define STRUCT_FLD(name, value) value
#endif #endif