5.5.33a merge
This commit is contained in:
commit
2fe0836eed
@ -30,14 +30,23 @@ MACRO (USE_BUNDLED_JEMALLOC)
|
||||
ENDMACRO()
|
||||
|
||||
SET(WITH_JEMALLOC "yes" CACHE STRING
|
||||
"Which jemalloc to use (possible values are 'no', 'bundled', 'yes' (same as bundled)")
|
||||
#"Which jemalloc to use (possible values are 'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)")
|
||||
"Which jemalloc to use (possible values are 'no', 'bundled', 'system', 'yes' (system if possible, otherwise bundled)")
|
||||
|
||||
MACRO (CHECK_JEMALLOC)
|
||||
IF(WIN32)
|
||||
SET(WITH_JEMALLOC "no")
|
||||
ENDIF()
|
||||
IF(WITH_JEMALLOC STREQUAL "bundled" OR WITH_JEMALLOC STREQUAL "yes")
|
||||
IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
|
||||
CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
|
||||
IF (HAVE_JEMALLOC)
|
||||
SET(LIBJEMALLOC jemalloc)
|
||||
ELSEIF (WITH_JEMALLOC STREQUAL "system")
|
||||
MESSAGE(FATAL_ERROR "system jemalloc is not found")
|
||||
ELSEIF (WITH_JEMALLOC STREQUAL "yes")
|
||||
SET(trybundled 1)
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
IF(WITH_JEMALLOC STREQUAL "bundled" OR trybundled)
|
||||
USE_BUNDLED_JEMALLOC()
|
||||
ENDIF()
|
||||
ENDMACRO()
|
||||
|
3
debian/dist/Debian/control
vendored
3
debian/dist/Debian/control
vendored
@ -14,7 +14,8 @@ Package: libmariadbclient18
|
||||
Section: libs
|
||||
Architecture: any
|
||||
Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
|
||||
Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
|
||||
Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33),
|
||||
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
|
||||
Description: MariaDB database client library
|
||||
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
|
||||
server. SQL (Structured Query Language) is the most popular database query
|
||||
|
3
debian/dist/Ubuntu/control
vendored
3
debian/dist/Ubuntu/control
vendored
@ -14,7 +14,8 @@ Package: libmariadbclient18
|
||||
Section: libs
|
||||
Architecture: any
|
||||
Depends: mariadb-common, libmysqlclient18 (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
|
||||
Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33)
|
||||
Conflicts: mariadb-server-5.5 (<< 5.5.33), mariadb-galera-server-5.5 (<< 5.5.33),
|
||||
mariadb-server-5.1, mariadb-server-5.2, mariadb-server-5.3
|
||||
Description: MariaDB database client library
|
||||
MariaDB is a fast, stable and true multi-user, multi-threaded SQL database
|
||||
server. SQL (Structured Query Language) is the most popular database query
|
||||
|
@ -83,15 +83,15 @@ Options unknown to
|
||||
are passed to
|
||||
\fBmysqld\fR
|
||||
if they are specified on the command line, but ignored if they are specified in the
|
||||
[mysqld_safe]
|
||||
group of an option file\&. See
|
||||
[mysqld_safe] or [mariadb_safe]
|
||||
groups of an option file\&. See
|
||||
Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
|
||||
.PP
|
||||
\fBmysqld_safe\fR
|
||||
reads all options from the
|
||||
[mysqld],
|
||||
[server], and
|
||||
[mysqld_safe]
|
||||
[server],
|
||||
[mysqld_safe], and [mariadb_safe]
|
||||
sections in option files\&. For example, if you specify a
|
||||
[mysqld]
|
||||
section like this,
|
||||
@ -146,40 +146,6 @@ Display a help message and exit\&.
|
||||
.sp -1
|
||||
.IP \(bu 2.3
|
||||
.\}
|
||||
.\" mysqld_safe: autoclose option
|
||||
.\" autoclose option: mysqld_safe
|
||||
\fB\-\-autoclose\fR
|
||||
.sp
|
||||
(NetWare only) On NetWare,
|
||||
\fBmysqld_safe\fR
|
||||
provides a screen presence\&. When you unload (shut down) the
|
||||
\fBmysqld_safe\fR
|
||||
NLM, the screen does not by default go away\&. Instead, it prompts for user input:
|
||||
.sp
|
||||
.if n \{\
|
||||
.RS 4
|
||||
.\}
|
||||
.nf
|
||||
*<NLM has terminated; Press any key to close the screen>*
|
||||
.fi
|
||||
.if n \{\
|
||||
.RE
|
||||
.\}
|
||||
.sp
|
||||
If you want NetWare to close the screen automatically instead, use the
|
||||
\fB\-\-autoclose\fR
|
||||
option to
|
||||
\fBmysqld_safe\fR\&.
|
||||
.RE
|
||||
.sp
|
||||
.RS 4
|
||||
.ie n \{\
|
||||
\h'-04'\(bu\h'+03'\c
|
||||
.\}
|
||||
.el \{\
|
||||
.sp -1
|
||||
.IP \(bu 2.3
|
||||
.\}
|
||||
.\" mysqld_safe: basedir option
|
||||
.\" basedir option: mysqld_safe
|
||||
\fB\-\-basedir=\fR\fB\fIpath\fR\fR
|
||||
|
@ -1,2 +1,13 @@
|
||||
show create table t1;
|
||||
ERROR 42000: Unknown storage engine 'InnoDB'
|
||||
call mtr.add_suppression("t1.frm is inconsistent: engine typecode 43, engine name Aria");
|
||||
show create table t1;
|
||||
Table Create Table
|
||||
t1 CREATE TABLE `t1` (
|
||||
`a` int(11) DEFAULT NULL,
|
||||
`b` int(11) DEFAULT NULL,
|
||||
`c` int(11) DEFAULT NULL,
|
||||
KEY `a` (`a`),
|
||||
KEY `b` (`b`)
|
||||
) ENGINE=Aria DEFAULT CHARSET=latin1 PAGE_CHECKSUM=1
|
||||
drop table t1;
|
||||
|
BIN
mysql-test/std_data/mdev5029_2.MAD
Normal file
BIN
mysql-test/std_data/mdev5029_2.MAD
Normal file
Binary file not shown.
BIN
mysql-test/std_data/mdev5029_2.MAI
Normal file
BIN
mysql-test/std_data/mdev5029_2.MAI
Normal file
Binary file not shown.
BIN
mysql-test/std_data/mdev5029_2.frm
Normal file
BIN
mysql-test/std_data/mdev5029_2.frm
Normal file
Binary file not shown.
@ -4,8 +4,17 @@
|
||||
# a.k.a. fail to open an frm with indexes:
|
||||
|
||||
let $datadir=`select @@datadir`;
|
||||
copy_file std_data/mdev5029.frm $datadir/test/t1.frm;
|
||||
|
||||
# normal innodb table (but innodb is disabled here)
|
||||
copy_file std_data/mdev5029_1.frm $datadir/test/t1.frm;
|
||||
--error ER_UNKNOWN_STORAGE_ENGINE
|
||||
show create table t1;
|
||||
remove_file $datadir/test/t1.frm;
|
||||
|
||||
# Aria table, incorrect typecode
|
||||
call mtr.add_suppression("t1.frm is inconsistent: engine typecode 43, engine name Aria");
|
||||
copy_file std_data/mdev5029_2.frm $datadir/test/t1.frm;
|
||||
copy_file std_data/mdev5029_2.MAI $datadir/test/t1.MAI;
|
||||
copy_file std_data/mdev5029_2.MAD $datadir/test/t1.MAD;
|
||||
show create table t1;
|
||||
drop table t1;
|
||||
|
@ -509,7 +509,7 @@ then
|
||||
SET_USER=0
|
||||
fi
|
||||
|
||||
parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld`
|
||||
parse_arguments `$print_defaults $defaults --loose-verbose mysqld_safe safe_mysqld mariadb_safe`
|
||||
parse_arguments PICK-ARGS-FROM-ARGV "$@"
|
||||
|
||||
|
||||
|
@ -1135,7 +1135,10 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write,
|
||||
if (se_plugin)
|
||||
{
|
||||
/* bad file, legacy_db_type did not match the name */
|
||||
goto err;
|
||||
sql_print_warning("%s.frm is inconsistent: engine typecode %d, engine name %s (%d)",
|
||||
share->normalized_path.str, legacy_db_type,
|
||||
plugin_name(tmp_plugin)->str,
|
||||
ha_legacy_type(plugin_data(tmp_plugin, handlerton *)));
|
||||
}
|
||||
/*
|
||||
tmp_plugin is locked with a local lock.
|
||||
|
@ -1,6 +1,7 @@
|
||||
# ft-index only supports x86-64 and cmake-2.8.9+
|
||||
IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND
|
||||
NOT CMAKE_VERSION VERSION_LESS "2.8.9")
|
||||
NOT CMAKE_VERSION VERSION_LESS "2.8.9" AND
|
||||
NOT WITHOUT_TOKUDB AND NOT WITHOUT_TOKUDB_STORAGE_ENGINE)
|
||||
CHECK_CXX_SOURCE_COMPILES(
|
||||
"
|
||||
struct a {int b; int c; };
|
||||
|
Loading…
x
Reference in New Issue
Block a user