Commit graph

173146 commits

Author SHA1 Message Date
Sergei Golubchik
65d69c84cf cmake: remove unused checks, options, and symbols 2015-11-23 16:02:56 +01:00
Sergei Golubchik
e4b88235b5 cmake: rename symbols used internally by check_compiler_flag.cmake
(that is MY_CHECK_C_COMPILER_FLAG, MY_CHECK_CXX_COMPILER_FLAG,
MY_CHECK_AND_SET_COMPILER_FLAG)

This is to have a clear "internal" name prefix and to avoid
mixing them with hand-named symbols
2015-11-23 16:02:56 +01:00
Sergei Golubchik
679aa122bf fix debian packaging for 10.2 2015-11-23 16:02:56 +01:00
Alexander Barkov
d73cf394a5 MDEV-9170 Get rid of LEX::length and LEX::dec
A preparatory task for:
  MDEV-4912 Add a plugin to field types (column types)
2015-11-23 18:55:01 +04:00
Alexander Barkov
b7e9bf9122 MDEV-9169 BINLOG_SYM in keywords_sp causes shift/reduce conflicts 2015-11-23 17:52:09 +04:00
Otto Kekäläinen
b7eaba474d Bump debian/changelog for 10.2 series 2015-11-23 16:11:06 +04:00
Alexander Barkov
6b97b0c5e0 MDEV-9166 Wrong error message and shift/reduce conflicts in the RETURNS clause 2015-11-23 14:49:23 +04:00
Sergei Golubchik
d0dc7b3e92 Merge branch '10.1' into 10.2 2015-11-20 11:18:16 +01:00
Sergei Golubchik
0d66c7dd84 update tokudb to 10.2 2015-11-20 11:14:21 +01:00
Sergei Golubchik
2fc3dc393d Merge branch '10.1' into bb-10.1-serg 2015-11-20 09:31:13 +01:00
Sergei Golubchik
e52c753ab9 cleanup 2015-11-20 09:16:36 +01:00
Nirbhay Choubey
df25018c2a MDEV-6264: CentOS missing lsof as dependency for MariaDB-server (10.1)
wsrep.cmake should be included before cpack_rpm.cmake as it defines
WITH_WSREP, required by cpack_rpm.cmake to conditionally include galera
helper tools in server package's requires list.
2015-11-20 09:16:36 +01:00
Sergei Golubchik
87c306802b update test results 2015-11-20 09:16:36 +01:00
Monty
1e156e1436 Fixed compile warnings on Solaris 2015-11-20 10:00:06 +02:00
Monty
981b474753 Updated configure.pl to new plugin syntax
--with-plugin-name=xxxx
--with-plugins= now uses =AUTO instead of =1
2015-11-20 09:57:58 +02:00
Sergei Golubchik
fdba672b6f Post-merge fixes for Connect engine
1. define connect_EXPORTS, this causes the engine to use MariaDB
   versions for timestamp<->struct tm conversion instead of
   TZ-dependent libc versions.
2. remove check_access() that was removed once, but re-appeared
   during a complex merge.
3. disable a totally broken test
4. update test results
5. skip odbc_firebird test when no firebird DSN is available
2015-11-19 21:23:35 +01:00
Sergei Golubchik
e3d37bfebf Merge branch 'connect/10.1' into 10.1 2015-11-19 18:09:06 +01:00
Sergei Golubchik
7f19330c59 Merge branch 'github/10.0-galera' into 10.1 2015-11-19 17:48:36 +01:00
Sergei Golubchik
4046ed12bc rbr and savepoint in a subtatement
Apply MySQL fix for bug#76727:
https://github.com/mysql/mysql-server/commit/69d4e72c

  Bug#20901025: SLAVE ASSERTION IN UNPACK_ROW WITH ROLLBACK TO
  SAVEPOINT IN ERROR HANDLER
2015-11-19 17:04:19 +01:00
Sergei Golubchik
33ab30dfe2 fix tokudb compilation with bundled zlib 2015-11-19 16:39:40 +01:00
Sergei Golubchik
d4017d498f fix for windows builders 2015-11-19 15:53:36 +01:00
Sergei Golubchik
c99fba2678 compilation warning 2015-11-19 15:53:16 +01:00
Sergei Golubchik
beded7d9c9 Merge branch '10.0' into 10.1 2015-11-19 15:52:14 +01:00
Sergei Golubchik
af71da5d2f remove duplicated like 2015-11-19 14:01:16 +01:00
Oleksandr Byelkin
81e4ce5e31 Removed depricated optimizer_search_depth. 2015-11-19 10:56:30 +01:00
Sergei Golubchik
2553f143fd fix feedback plugin not to crash in debug builds
feedback was bzero-ing thd->status_vars.memory_used,
but server was asserting the correct value of it
2015-11-19 10:17:40 +01:00
Sergei Golubchik
ab476a8d10 Merge branch '5.5' into 10.0 2015-11-18 22:03:02 +01:00
Sergei Petrunia
f91798dd1c MDEV-7370: Server deadlocks on renaming a table for which persistent statistics exists
RENAME TABLE code tries to update EITS statistics. It hung, because
it used an index on (db_name,table_name) to find the table, and attempted
to update these values at the same time. The fix is do what SQL UPDATE
statement does when updating index that it's used for scanning:
- First, buffer the rowids of rows to be updated,
- then make the second pass to actually update the rows

Also fixed the call to rename_table_in_stat_tables() in sql_rename.cc
to pass the correct new database (before, it passed old db_name so cross-
database renames were not handled correctly).

Variant #2, with review feedback addressed.
2015-11-18 21:31:45 +03:00
Monty
c2ec897745 Fixed buildbot failures on Solaris 64 bit
rpl/rpl_mdev382     ; Wrong replace in show_binlog_events2.inc
binlog/database     ; Different error on Solaris if file exists
mroonga/repair_table_no_index_file ; Different system error on Solaris
partition_not_blackhole ; Different error on Solaris
partition_myisam     ; Different error on Solaris

Some other failures in mroonga was because have_32bit.inc didn't correctly
detect 64 bits on Solaris. Fixed using DEFAULT_MACHINE instead of MACHINE_TYPE
for Sys_version_compile_machine.
2015-11-18 17:42:39 +02:00
Monty
f383cbcb03 Added some selects to rpl_parallel2.test to find out where it fails in buildbot 2015-11-18 14:46:30 +02:00
Sergei Golubchik
43a5090980 MDEV-9051 mysqld got signal 11, after upgrade to 10.1.8
feedback plugin needs to set tables->select_lex properly
2015-11-18 11:23:15 +01:00
Sergei Golubchik
726162989b feedback plugin debug
make it possible to change feedback plugin wait intervals
* only in debug builds
* and force the feedback report to be ignored

update the test to use this feature
2015-11-18 11:23:15 +01:00
Nirbhay Choubey
f47124c9ef Incorrect statements binlogged on slave with do_domain_ids=(...)
In domain ID based filtering, a flag is used to filter-out
the events that belong to a particular domain. This flag gets
set when IO thread receives a GTID_EVENT for the domain on
filter list and its reset at the last event in the GTID group.
The resetting, however, was wrongly done before the decision to
write/filter the event from relay log is made. As a result, the
last event in the group will always pass through the filter.
Fixed by deferring the reset logic. Also added a test case.
2015-11-18 02:11:20 -05:00
Vladislav Vaintroub
dd90dae3c0 MDEV-7588 Add thd_wait_begin/end to notify threadpool of binlog waits 2015-11-17 20:08:36 +01:00
Alexey Botchkov
836275bb20 MDEV-4829 BEFORE INSERT triggers dont issue 1406 error.
Turn the 'abort_on_warning' on for assigning value to fields.
2015-11-17 22:09:42 +04:00
Vladislav Vaintroub
e669a5fd87 MDEV-7588 Add thd_wait_begin/end to notify threadpool of binlog waits 2015-11-17 18:33:08 +01:00
Monty
905613f825 Fixed wrong tests found by buildbot 2015-11-17 18:19:59 +02:00
Oleksandr Byelkin
19d99faf1e MDEV-8734 mysqlbinlog --start-position isn't bigint
fix it only for local operations.
2015-11-17 14:42:21 +01:00
Jan Lindström
c0216f1d02 MDEV-9099: Test encryption.innodb_encryption_discard_import fails on buildbot 2015-11-17 09:46:40 +02:00
Nirbhay Choubey
f4421c893b Fix for some failing tests. 2015-11-16 12:39:56 -05:00
Nirbhay Choubey
c78fc8b1ea MTR: rsync process is left running if pid file is removed
MTR drops the datadir in the event of a test failure. In case mysqld
is running as a Galera node and a failure occurs while the SST is in
progress, the rsync pid file gets removed as part of the cleanup and
wsrep_sst_rsync, which relies on this file, fails to kill the rsync.
Fixed by using the cached $RSYNC_REAL_PID to kill rsync daemon.
2015-11-16 12:35:06 -05:00
Sergei Golubchik
3228ad33f0 MDEV-8973 Build failure on missing alloca.h
in *BSD family alloca() is in stdlib.h
2015-11-16 07:55:55 +01:00
Sergei Golubchik
0c5f36d579 MDEV-8969 groonga is compiled even with -DPLUGIN_MROONGA=NO
first add mroonga plugin (MYSQL_ADD_PLUGIN) then add dependent
targets (add_subdirectory(groonga))
2015-11-16 07:55:55 +01:00
Sergei Golubchik
12c32bd989 MDEV-8962 TokuDB tries to build on OS X, even when disabled in compile flag
first add tokudb plugin (MYSQL_ADD_PLUGIN) then add dependent
targets (ADD_SUBDIRECTORY(ft-index))
2015-11-16 07:55:55 +01:00
Sergei Golubchik
296338147c MDEV-8453 Alter table not returning engine errors
remove ~15 years old print_lock_error() function, use
handler::print_error() instead
2015-11-16 07:55:55 +01:00
Sergei Golubchik
daf3551cce add missing DBUG_RETURN-s 2015-11-16 07:55:55 +01:00
Sergei Golubchik
2e0ac16827 remove obsolete workaround
The workaround is not needed anymore - mariadb requires bison 2.x.

And removing all __attribute__ in sql_yacc.yy breaks
new DBUG_ENTER.
2015-11-16 07:55:55 +01:00
Sergei Golubchik
da957310d0 compiler warning (no return in non-void function) 2015-11-16 07:55:55 +01:00
Sergei Golubchik
29dd634a4c dbug: correct trace for DBUG_RETURN(func()); -- gcc only
when func1 calls func2 from DBUG_RETURN, dbug shows the trace as
| > func1
| < func1
| > func2
| < func2
because DBUG_LEAVE happens before func2(). Change that to invoke
DBUG_LEAVE when the local variable goes out of scope. This uses
gcc specific __attribute__((cleanup)).
2015-11-16 07:55:55 +01:00
Sergei Golubchik
8f60656fd5 MDEV-9039 Can't upgrade MariaDB to to 10.1.8 version from 10.0.21
Don't mark the SEQUENCE engine as XA-capable. The engine never
registers itself for any transaction, so it doesn't matter
whether it is XA-capable or not. The only effect of being
"XA-capable" is breaking the "number of XA-capable engines"
check of TC_LOG_MMAP.
2015-11-16 07:55:55 +01:00