Commit b2bbd30d authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

merge with 5.5

parents d76c8070 f4f95c17
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
# Binary must be compiled with debug for crash to occur # Binary must be compiled with debug for crash to occur
call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:"); call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table"); call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
flush tables;
SET GLOBAL delay_key_write=ALL; SET GLOBAL delay_key_write=ALL;
CREATE TABLE t1(a INT, CREATE TABLE t1(a INT,
b INT, b INT,
......
...@@ -4,9 +4,6 @@ The following options may be given as the first argument: ...@@ -4,9 +4,6 @@ The following options may be given as the first argument:
--defaults-file=# Only read default options from the given file #. --defaults-file=# Only read default options from the given file #.
--defaults-extra-file=# Read this file after the global files are read. --defaults-extra-file=# Read this file after the global files are read.
--abort-slave-event-count=#
Option used by mysql-test for debugging and testing of
replication.
--allow-suspicious-udfs --allow-suspicious-udfs
Allows use of UDFs consisting of only one symbol xxx() Allows use of UDFs consisting of only one symbol xxx()
without corresponding xxx_init() or xxx_deinit(). That without corresponding xxx_init() or xxx_deinit(). That
...@@ -151,9 +148,6 @@ The following options may be given as the first argument: ...@@ -151,9 +148,6 @@ The following options may be given as the first argument:
handling INSERT DELAYED. If the queue becomes full, any handling INSERT DELAYED. If the queue becomes full, any
client that does INSERT DELAYED will wait until there is client that does INSERT DELAYED will wait until there is
room in the queue again room in the queue again
--disconnect-slave-event-count=#
Option used by mysql-test for debugging and testing of
replication.
--div-precision-increment=# --div-precision-increment=#
Precision of the result of '/' operator will be increased Precision of the result of '/' operator will be increased
on that value on that value
...@@ -165,7 +159,6 @@ The following options may be given as the first argument: ...@@ -165,7 +159,6 @@ The following options may be given as the first argument:
Enable the event scheduler. Possible values are ON, OFF, Enable the event scheduler. Possible values are ON, OFF,
and DISABLED (keep the event scheduler completely and DISABLED (keep the event scheduler completely
deactivated, it cannot be activated run-time) deactivated, it cannot be activated run-time)
-T, --exit-info[=#] Used for debugging. Use at your own risk.
--expire-logs-days=# --expire-logs-days=#
If non-zero, binary logs will be purged after If non-zero, binary logs will be purged after
expire_logs_days days; possible purges happen at startup expire_logs_days days; possible purges happen at startup
...@@ -195,7 +188,7 @@ The following options may be given as the first argument: ...@@ -195,7 +188,7 @@ The following options may be given as the first argument:
Number of best matches to use for query expansion Number of best matches to use for query expansion
--ft-stopword-file=name --ft-stopword-file=name
Use stopwords from this file instead of built-in list Use stopwords from this file instead of built-in list
--gdb Set up signals usable for debugging. --gdb Set up signals usable for debugging. Deprecated, use
--general-log Log connections and queries to a table or log file. --general-log Log connections and queries to a table or log file.
Defaults logging to a file 'hostname'.log or a table Defaults logging to a file 'hostname'.log or a table
mysql.general_logif --log-output=TABLE is used mysql.general_logif --log-output=TABLE is used
...@@ -358,9 +351,6 @@ The following options may be given as the first argument: ...@@ -358,9 +351,6 @@ The following options may be given as the first argument:
Max packet length to send to or receive from the server Max packet length to send to or receive from the server
--max-binlog-cache-size=# --max-binlog-cache-size=#
Sets the total size of the transactional cache Sets the total size of the transactional cache
--max-binlog-dump-events=#
Option used by mysql-test for debugging and testing of
replication.
--max-binlog-size=# Binary log will be rotated automatically when the size --max-binlog-size=# Binary log will be rotated automatically when the size
exceeds this value. Will also apply to relay logs if exceeds this value. Will also apply to relay logs if
max_relay_log_size is 0 max_relay_log_size is 0
...@@ -774,9 +764,6 @@ The following options may be given as the first argument: ...@@ -774,9 +764,6 @@ The following options may be given as the first argument:
--sort-buffer-size=# --sort-buffer-size=#
Each thread that needs to do a sort allocates a buffer of Each thread that needs to do a sort allocates a buffer of
this size this size
--sporadic-binlog-dump-fail
Option used by mysql-test for debugging and testing of
replication.
--sql-mode=name Syntax: sql-mode=mode[,mode[,mode...]]. See the manual --sql-mode=name Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
for the complete list of valid sql modes for the complete list of valid sql modes
--stack-trace Print a symbolic stack trace on failure --stack-trace Print a symbolic stack trace on failure
...@@ -797,9 +784,6 @@ The following options may be given as the first argument: ...@@ -797,9 +784,6 @@ The following options may be given as the first argument:
Synchronously flush relay log info to disk after every Synchronously flush relay log info to disk after every
#th transaction. Use 0 (default) to disable synchronous #th transaction. Use 0 (default) to disable synchronous
flushing flushing
--sync-sys Enable system sync calls. Disable only when running tests
or debugging!
(Defaults to on; use --skip-sync-sys to disable.)
--sysdate-is-now Non-default option to alias SYSDATE() to NOW() to make it --sysdate-is-now Non-default option to alias SYSDATE() to NOW() to make it
safe-replicable. Since 5.0, SYSDATE() returns a `dynamic' safe-replicable. Since 5.0, SYSDATE() returns a `dynamic'
value different for different invocations, even within value different for different invocations, even within
...@@ -812,9 +796,6 @@ The following options may be given as the first argument: ...@@ -812,9 +796,6 @@ The following options may be given as the first argument:
--tc-heuristic-recover=name --tc-heuristic-recover=name
Decision to use in heuristic recover process. Possible Decision to use in heuristic recover process. Possible
values are COMMIT or ROLLBACK. values are COMMIT or ROLLBACK.
--thread-alarm Enable system thread alarm calls. Disabling it may be
useful in debugging or testing, never do it in production
(Defaults to on; use --skip-thread-alarm to disable.)
--thread-cache-size=# --thread-cache-size=#
How many threads we should keep in a cache for reuse How many threads we should keep in a cache for reuse
--thread-stack=# The stack size for each thread --thread-stack=# The stack size for each thread
...@@ -852,7 +833,6 @@ The following options may be given as the first argument: ...@@ -852,7 +833,6 @@ The following options may be given as the first argument:
connection before closing it connection before closing it
Variables (--variable-name=value) Variables (--variable-name=value)
abort-slave-event-count 0
allow-suspicious-udfs FALSE allow-suspicious-udfs FALSE
auto-increment-increment 1 auto-increment-increment 1
auto-increment-offset 1 auto-increment-offset 1
...@@ -893,7 +873,6 @@ delay-key-write ON ...@@ -893,7 +873,6 @@ delay-key-write ON
delayed-insert-limit 100 delayed-insert-limit 100
delayed-insert-timeout 300 delayed-insert-timeout 300
delayed-queue-size 1000 delayed-queue-size 1000
disconnect-slave-event-count 0
div-precision-increment 4 div-precision-increment 4
engine-condition-pushdown FALSE engine-condition-pushdown FALSE
event-scheduler OFF event-scheduler OFF
...@@ -958,7 +937,6 @@ master-retry-count 86400 ...@@ -958,7 +937,6 @@ master-retry-count 86400
master-verify-checksum FALSE master-verify-checksum FALSE
max-allowed-packet 8388608 max-allowed-packet 8388608
max-binlog-cache-size 18446744073709547520 max-binlog-cache-size 18446744073709547520
max-binlog-dump-events 0
max-binlog-size 1073741824 max-binlog-size 1073741824
max-binlog-stmt-cache-size 18446744073709547520 max-binlog-stmt-cache-size 18446744073709547520
max-connect-errors 10 max-connect-errors 10
...@@ -1073,7 +1051,6 @@ slave-type-conversions ...@@ -1073,7 +1051,6 @@ slave-type-conversions
slow-launch-time 2 slow-launch-time 2
slow-query-log FALSE slow-query-log FALSE
sort-buffer-size 2097152 sort-buffer-size 2097152
sporadic-binlog-dump-fail FALSE
sql-mode sql-mode
stack-trace TRUE stack-trace TRUE
symbolic-links FALSE symbolic-links FALSE
...@@ -1082,13 +1059,11 @@ sync-frm FALSE ...@@ -1082,13 +1059,11 @@ sync-frm FALSE
sync-master-info 0 sync-master-info 0
sync-relay-log 0 sync-relay-log 0
sync-relay-log-info 0 sync-relay-log-info 0
sync-sys TRUE
sysdate-is-now FALSE sysdate-is-now FALSE
table-cache 400 table-cache 400
table-definition-cache 400 table-definition-cache 400
table-open-cache 400 table-open-cache 400
tc-heuristic-recover COMMIT tc-heuristic-recover COMMIT
thread-alarm TRUE
thread-cache-size 0 thread-cache-size 0
thread-stack 294912 thread-stack 294912
time-format %H:%i:%s time-format %H:%i:%s
......
call mtr.add_suppression("nnoDB: Error: table `test`.`t1` .* Partition.* InnoDB internal"); call mtr.add_suppression("InnoDB: Error: table `test`.`t1` .* InnoDB internal");
# #
# Bug#55091: Server crashes on ADD PARTITION after a failed attempt # Bug#55091: Server crashes on ADD PARTITION after a failed attempt
# #
......
...@@ -28,9 +28,9 @@ LOAD DATA INFILE 'MYSQL_TMP_DIR/B11764517.tmp' INTO TABLE t1; ...@@ -28,9 +28,9 @@ LOAD DATA INFILE 'MYSQL_TMP_DIR/B11764517.tmp' INTO TABLE t1;
LOAD DATA INFILE 'MYSQL_TMP_DIR_UCASE/B11764517.tmp' INTO TABLE t1; LOAD DATA INFILE 'MYSQL_TMP_DIR_UCASE/B11764517.tmp' INTO TABLE t1;
LOAD DATA INFILE 'MYSQL_TMP_DIR_LCASE/B11764517.tmp' INTO TABLE t1; LOAD DATA INFILE 'MYSQL_TMP_DIR_LCASE/B11764517.tmp' INTO TABLE t1;
LOAD DATA INFILE "MYSQL_TMP_DIR\\..a..\\..\\..\\B11764517.tmp" into table t1; LOAD DATA INFILE "MYSQL_TMP_DIR\\..a..\\..\\..\\B11764517.tmp" into table t1;
ERROR HY000: The MySQL server is running with the --secure-file-priv option so it cannot execute this statement ERROR HY000: The MariaDB server is running with the --secure-file-priv option so it cannot execute this statement
SELECT * FROM t1 INTO OUTFILE 'MYSQL_TMP_DIR\\..a..\\..\\..\\B11764517-2.tmp'; SELECT * FROM t1 INTO OUTFILE 'MYSQL_TMP_DIR\\..a..\\..\\..\\B11764517-2.tmp';
ERROR HY000: The MySQL server is running with the --secure-file-priv option so it cannot execute this statement ERROR HY000: The MariaDB server is running with the --secure-file-priv option so it cannot execute this statement
SELECT * FROM t1 INTO OUTFILE 'MYSQL_TMP_DIR\\B11764517-2.tmp'; SELECT * FROM t1 INTO OUTFILE 'MYSQL_TMP_DIR\\B11764517-2.tmp';
SELECT * FROM t1 INTO OUTFILE 'MYSQL_TMP_DIR/B11764517-3.tmp'; SELECT * FROM t1 INTO OUTFILE 'MYSQL_TMP_DIR/B11764517-3.tmp';
SELECT * FROM t1 INTO OUTFILE 'MYSQL_TMP_DIR_UCASE/B11764517-4.tmp'; SELECT * FROM t1 INTO OUTFILE 'MYSQL_TMP_DIR_UCASE/B11764517-4.tmp';
......
...@@ -737,71 +737,6 @@ WHERE ...@@ -737,71 +737,6 @@ WHERE
table3.col_varchar_nokey = table2.col_varchar_key AND table3.pk > table2.col_varchar_nokey ; table3.col_varchar_nokey = table2.col_varchar_key AND table3.pk > table2.col_varchar_nokey ;
count(*) sum(table1.col_int_key*table2.pk) count(*) sum(table1.col_int_key*table2.pk)
240 185955 240 185955
Warnings:
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'm'
Warning 1292 Truncated incorrect DOUBLE value: 'm'
Warning 1292 Truncated incorrect DOUBLE value: 'm'
Warning 1292 Truncated incorrect DOUBLE value: 'm'
Warning 1292 Truncated incorrect DOUBLE value: 'm'
Warning 1292 Truncated incorrect DOUBLE value: 'm'
Warning 1292 Truncated incorrect DOUBLE value: 'm'
Warning 1292 Truncated incorrect DOUBLE value: 'm'
Warning 1292 Truncated incorrect DOUBLE value: 'm'
Warning 1292 Truncated incorrect DOUBLE value: 'm'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
Warning 1292 Truncated incorrect DOUBLE value: 'v'
drop table t1,t2; drop table t1,t2;
set join_cache_level=@my_save_join_cache_level; set join_cache_level=@my_save_join_cache_level;
set join_buffer_size=@my_save_join_buffer_size; set join_buffer_size=@my_save_join_buffer_size;
......
...@@ -6,8 +6,8 @@ CREATE TABLE t1(a int) ENGINE=ARCHIVE; ...@@ -6,8 +6,8 @@ CREATE TABLE t1(a int) ENGINE=ARCHIVE;
DROP TABLE t1; DROP TABLE t1;
--replace_regex /\.dll/.so/ --replace_regex /\.dll/.so/
eval INSTALL PLUGIN archive SONAME '$HA_ARCHIVE_SO'; eval INSTALL PLUGIN archive SONAME '$HA_ARCHIVE_SO';
--error 1125
--replace_regex /\.dll/.so/ --replace_regex /\.dll/.so/
--error 1125
eval INSTALL PLUGIN ARCHIVE SONAME '$HA_ARCHIVE_SO'; eval INSTALL PLUGIN ARCHIVE SONAME '$HA_ARCHIVE_SO';
UNINSTALL PLUGIN archive; UNINSTALL PLUGIN archive;
......
...@@ -6,8 +6,8 @@ CREATE TABLE t1(a int) ENGINE=BLACKHOLE; ...@@ -6,8 +6,8 @@ CREATE TABLE t1(a int) ENGINE=BLACKHOLE;
DROP TABLE t1; DROP TABLE t1;
--replace_regex /\.dll/.so/ --replace_regex /\.dll/.so/
eval INSTALL PLUGIN blackhole SONAME '$HA_BLACKHOLE_SO'; eval INSTALL PLUGIN blackhole SONAME '$HA_BLACKHOLE_SO';
--error 1125
--replace_regex /\.dll/.so/ --replace_regex /\.dll/.so/
--error 1125
eval INSTALL PLUGIN BLACKHOLE SONAME '$HA_BLACKHOLE_SO'; eval INSTALL PLUGIN BLACKHOLE SONAME '$HA_BLACKHOLE_SO';
UNINSTALL PLUGIN blackhole; UNINSTALL PLUGIN blackhole;
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:"); call mtr.add_suppression("Got an error from thread_id=.*ha_myisam.cc:");
call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table"); call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
flush tables;
# Avoid CrashReporter popup on Mac # Avoid CrashReporter popup on Mac
--source include/not_crashrep.inc --source include/not_crashrep.inc
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
let $MYSQLD_DATADIR= `SELECT @@datadir`; let $MYSQLD_DATADIR= `SELECT @@datadir`;
call mtr.add_suppression("nnoDB: Error: table `test`.`t1` .* Partition.* InnoDB internal"); call mtr.add_suppression("InnoDB: Error: table `test`.`t1` .* InnoDB internal");
--echo # --echo #
--echo # Bug#55091: Server crashes on ADD PARTITION after a failed attempt --echo # Bug#55091: Server crashes on ADD PARTITION after a failed attempt
--echo # --echo #
......
...@@ -356,13 +356,13 @@ set @my_save_join_cache_level= @@join_cache_level; ...@@ -356,13 +356,13 @@ set @my_save_join_cache_level= @@join_cache_level;
set @my_save_join_buffer_size= @@join_buffer_size; set @my_save_join_buffer_size= @@join_buffer_size;
set join_cache_level=6; set join_cache_level=6;
set join_buffer_size=1536; set join_buffer_size=1536;
--disable_warnings
SELECT count(*), sum(table1.col_int_key*table2.pk) SELECT count(*), sum(table1.col_int_key*table2.pk)
FROM FROM
t2 AS table1, t1 AS table2, t2 AS table3 t2 AS table1, t1 AS table2, t2 AS table3
WHERE WHERE
table3.col_varchar_nokey = table2.col_varchar_key AND table3.pk > table2.col_varchar_nokey ; table3.col_varchar_nokey = table2.col_varchar_key AND table3.pk > table2.col_varchar_nokey ;
--enable_warnings
drop table t1,t2; drop table t1,t2;
set join_cache_level=@my_save_join_cache_level; set join_cache_level=@my_save_join_cache_level;
set join_buffer_size=@my_save_join_buffer_size; set join_buffer_size=@my_save_join_buffer_size;
......
CHECK_CXX_SOURCE_COMPILES( FIND_PACKAGE(Boost 1.45.0) # we need at least 1.45 if we want -fno-rtti for the server
"#include <boost/version.hpp> IF(NOT Boost_FOUND)
#if BOOST_VERSION >= 104000 RETURN()
#else ENDIF()
#error oops INCLUDE_DIRECTORIES(BEFORE ${Boost_INCLUDE_DIRS})
#endif
int main() { return 0; }" BOOST_OK)
# lp:756966 OQGRAPH on Win64 does not compile # lp:756966 OQGRAPH on Win64 does not compile
IF(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8) IF(MSVC AND CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(BOOST_OK 0) SET(BOOST_OK 0)
ELSE()
SET(BOOST_OK 1)
ENDIF() ENDIF()
IF(BOOST_OK) IF(BOOST_OK)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment