Commit graph

87442 commits

Author SHA1 Message Date
Alexander Barkov
67f514382b MDEV-5431 Test main.ctype_latin2 fails in buildbot
Fixing include/ctype_datetime.inc not to depend on the current time zone.
2013-12-11 16:37:53 +04:00
Sergey Vojtovich
b62bcdd2f4 MDEV-5319 - Request for merge of Oqgraph v3 functionality storage/oqgraph
into 10.0
2013-12-11 13:06:21 +04:00
Sergey Vojtovich
af2129f952 MDEV-5319 - Request for merge of Oqgraph v3 functionality storage/oqgraph
into 10.0
2013-12-11 13:02:12 +04:00
Alexander Barkov
9ac1130e13 An upstream bug fixed:
"mtr ctype_ldml" failed when compiled with "gcc -funsigned-char".
Changing the code not to depend on the signed/unsigned compiler defaults
for the "char" data type.
2013-12-11 12:30:12 +04:00
Alexander Barkov
03f6778d61 MDEV-5298 Illegal mix of collations on timestamp
Fixed.
2013-12-10 13:34:59 +04:00
Alexander Barkov
1f4f425a20 MDEV-5297 TIME(0), TIMESTAMP(0) and DATETIME(0) are self-incompatible during replication (upstream)
Fixed.
2013-12-06 19:02:55 +04:00
Alexander Barkov
0afd292073 Fixing an MSVC warning about double "const" data type qualifier
in the code merged from MySQL-5.6:

  const CHARSET_INFO* -> CHARSET_INFO*

(CHARSET_INFO already has the "const" qualifier in MariaDB, inlike in MySQL)
2013-12-05 16:54:50 +04:00
Sergey Petrunya
a428199298 Merge 2013-11-21 16:32:03 +04:00
unknown
55a7159f53 MDEV-4982: GTID looses all binlog state after crash if InnoDB is disabled
MDEV-4725: Incorrect binlog state recovery if crash while writing event group

The binlog state was not recovered correctly if XA is not used (eg. InnoDB
disabled), or if server crashed in the middle of writing an event group to the
binlog.

With this patch, we ensure that recovery of binlog state is done even if we do
not do the full XA binlog recovery, and we ensure that we only recover fully
written event groups into the binlog state.
2013-11-21 14:42:25 +01:00
Sergey Petrunya
bcd854fe33 MDEV-5308 Crash when running with slow_query_log=1
- Make log_slow_statement() always call delete_explain_query().
2013-11-21 16:29:46 +04:00
Sergey Petrunya
1926b83977 MDEV-5059: Wrong result (missing row) wih semijoin, join_cache_level > 2, LEFT JOIN, ORDER BY
- Added testcase
2013-11-21 13:35:20 +04:00
Alexander Barkov
146c8a4874 Merge 5.5->10.0-base 2013-11-21 13:16:26 +04:00
Alexander Barkov
2394fa67d4 MDEV-4859 Wrong value and data type of "SELECT MAX(time_column) + 1 FROM t1"
Fixed.
2013-11-21 11:46:36 +04:00
Andrew McDonnell
01c514fc88 Update plugin description 2013-11-21 18:03:09 +10:30
Sergey Petrunya
89ea0fc034 Merge 2013-11-21 11:21:53 +04:00
Alexander Barkov
c7355b1982 Merge 5.3->5.5 2013-11-21 13:09:08 +04:00
Sergey Petrunya
c4defdc8d9 MDEV-5161: Wrong result (missing rows) with semijoin, LEFT JOIN, ORDER BY, constant table
- Don't pull out a table out of a semi-join if it is on the inner side of an outer join.
- Make join->sort_by_table= get_sort_by_table(...) call after const table detection 
  is done. That way, the value of join->sort_by_table will match the actual execution.
  Which will allow the code in setup_semijoin_dups_elimination() (search for 
  "Make sure that possible sorting of rows from the head table is not to be employed." 
  to see that "Using filesort" is going to be used together with Duplicate Elimination (
  and change it to Using temporary + Using filesort)
2013-11-21 11:19:01 +04:00
Andrew McDonnell
61a16a3e19 Merge cleanup from maria dev branch 2013-11-21 17:43:11 +10:30
Alexander Barkov
8780e1ab24 ConnectSE: Adding CATFUNC=Tables and CATFUC=Columns for the XLS ODBC data source. 2013-11-20 18:27:13 +04:00
Jan Lindström
66612e8fd3 MDEV-5010: InnoDB errors appearing in logs with upgrade from 10.0.0 to 10.0.4.
Analysis: In earlier MySQL 5.6 versions this table innodb_index_stats  used to have a foreign key referencing to innodb_table_stats. However, in newer MySQL 5.6 versions this foreign key is removed and if you upgrade, your innodb_table_stats is created by the earlier mariadb version, thus a newer version will complain that the table is incorrectly defined.

Added drop foreign key on mysql_system_tables_fix.sql to be executed on mysql_upgrade.
2013-11-20 14:28:07 +02:00
Andrew McDonnell
ee44bfae6c Fix typo in MTR script that triggered a deprecation warning after 10.0.7 merge 2013-11-20 21:56:51 +10:30
Sergei Golubchik
5e812ee03b MDEV-5303 rpm post-inst scriptlet creates mysql user with a valid shell
create mysql user with /sbin/nologin shell
2013-11-20 12:18:46 +01:00
Andrew McDonnell
4ef0fd6725 Merge in latest maria 10.0.7 beta 2013-11-20 21:35:39 +10:30
Alexander Barkov
a392a911c2 Adding tests for CATFUC=Tables and CATFUNC=Columns into odbc_sqlite3.test. 2013-11-20 14:50:52 +04:00
Sergei Golubchik
98c609248b set CMP0022 policy to avoid cmake warnings 2013-11-20 11:50:27 +01:00
Michael Widenius
bbda717e93 Fixed compiler errors and warnings
extra/jemalloc/src/ctl.c:
  Fixed compiler warning
include/mysql/service_logger.h:
  Fixed compile failure with clang compiler
storage/maria/ma_check.c:
  Fixed compiler warning
support-files/compiler_warnings.supp:
  Suppressed warnings in jemalloc
tests/bug25714.c:
  Fixed compiler warning
2013-12-02 22:22:43 +02:00
Alexander Barkov
5a8bd446ad Merge 5.3->5.5
pending merges:
  Alexander Barkov 2013-12-02 MDEV-4857 Wrong result of HOUR('1 00:00:00')
2013-12-02 15:50:35 +04:00
Alexander Barkov
87355a453d Merge 5.3 -> 5.5
pending merges:
  Sergey Petrunya 2013-11-27 MDEV-5344: LEFT OUTER JOIN table data is lost...
2013-12-02 15:17:21 +04:00
Elena Stepanova
f130443707 Fixes for storage_engine tests 2013-11-28 20:02:51 +04:00
Elena Stepanova
253ed701e9 A fix for MySQL#65146 introduced a new warning.
Minor wording changes in skip messages.
2013-11-28 19:54:07 +04:00
Jan Lindström
a5e236db54 Add additional srv_use_fallocate guard for completing the IO with
read.
2013-11-28 11:34:43 +02:00
Jan Lindström
57a70a635a MDEV-5355: InnoDB assertion at shutdown if posix_fallocate is used in ut_a(node->n_pending == 0 || node->space->stop_new_ops);
Analysis: When filespace is extended there is first prepare for IO. But if
posix_fallocate is used there was no complete IO causing assertion
at shutdown indicating that all IO is not finished.

Fix: If posix_fallocate is used to extend the filespace, there
is no need to wait for IO to complete, thus we treat this
operation as a read operation. We need to mark IO as
completed or there would be assertion on shutdown at
fil_node_close_file() because all pending IO is not finished.
2013-11-27 20:24:52 +02:00
Alexey Botchkov
fb2de58294 MDEV-5321 Calling mysql_library_end accesses freed memory; dumps memory to display.
Don't call the vio_end() in the clean_up() in EMBEDDED mode.
        Call vio_end() before the end_embedded_server().
2013-11-25 21:38:01 +04:00
Nirbhay Choubey
1297a9ef19 Fix for a compiler warning. 2013-11-25 13:01:57 -05:00
Elena Stepanova
888efa0654 Increment the version number 2013-11-19 16:26:40 +04:00
unknown
170e9e593d MDEV-5306: Missing locking around rpl_global_gtid_binlog_state
There were some places where insufficient locking between
parallel threads could cause invalid memory accesses and
possibly other grief.

This patch adds the missing locking, and moves the locking
into the struct rpl_binlog_state methods to make it easier
to see that proper locking is in place everywhere.
2013-11-18 15:22:50 +01:00
Sergey Vojtovich
160236f880 MDEV-5182 - build of 10.0.4/r3863 fails @ 'cmake' with
-DINSTALL_SYSCONFDIR/-DDEFAULT_SYSCONFDIR specified

The reason for a bug is in support-files/CMakeLists.txt that tries to
install files in INSTALL_SYSCONF2DIR, without checking whether this
variable is actually defined. 

Normally INSTALL_SYSCONF2DIR is always defined if INSTALL_SYSCONFDIR is
defined, and support-files/CMakeLists.txt assumes that. But when one
specifies INSTALL_SYSCONFDIR manually on the command line, this
assumption might be broken.
2013-11-18 15:48:01 +04:00
Sergei Golubchik
45f81d4dcf merge 2013-11-20 09:20:48 +01:00
Sergei Golubchik
af2848a423 Percona-Server-5.5.34-rel32.0 merge 2013-11-19 15:43:22 +01:00
Sergei Golubchik
847fb4157e .bzrignore 2013-11-19 15:35:57 +01:00
Sergei Golubchik
ff41edab6c merge with ft-engine and ft-index up to tag:tokudb-7.1.0 2013-11-19 15:35:31 +01:00
Sergei Golubchik
fa3f8a18b2 mysql-5.5.34 merge
(some patches reverted, test case added)
2013-11-19 13:16:25 +01:00
Sergei Golubchik
efab095c7f MDEV-5236 Status variables are not all listed alphabetically
sort xtradb status variables
2013-11-19 13:11:42 +01:00
Sergey Petrunya
bc956c0046 MDEV-5069: Server crashes in SEL_ARG::increment_use_count with index_merge+index_merge_sort_union, FORCE INDEX
- Don't call incr_refs() is the merged SEL_ARG* is NULL.
2013-11-19 13:47:35 +04:00
Sergey Petrunya
8af289d2b0 MDEV-5293: outer join, join buffering, and order by - invalid query plan
- make_join_readinfo() has the code that forces use of "Using temporary; 
  Using filesort" when join buffering is in use.
  That code didn't handle all cases, in particular it didn't hande the case 
  where ORDER BY originally has tables from multiple columns, but the 
  optimizer eventually figures out that doing filesort() on one table 
  will be sufficient.  Adjusted the code to handle that case.
2013-11-18 12:26:25 +04:00
Jan Lindström
e730c91688 Added test case for new system variable innodb_use_stacktrace and made sure that it can be used only on startup. Fixed compiler problems on solaris and other platforms that do not contain necessary headers and functions. 2013-11-15 15:24:42 +02:00
Jan Lindström
338587d2f4 MDEV-5247: DB locked up at btr0cur.c line 568. Additional fixes to inconsistent usage of have_LRU_mutex and added additional debug assertions to guard incorrect usage of this mutex. Fixes issues found on additional testing and mysql test suite. 2013-11-15 11:32:02 +02:00
Sergei Golubchik
718c8c6044 5.3 merge 2013-11-15 10:06:23 +01:00
Igor Babaev
f8a6ee59ac Fixed bug mdev-5288.
This bug was a consequence of the incorrect fix for bug mdev-5091.
2013-11-14 13:25:05 -08:00
unknown
def3c98af4 MDEV-5291: Slave transaction retry on temporary error leaves dangling error in SHOW SLAVE STATUS
Make sure to clear the temporary error before the retry.
2013-11-14 15:08:29 +01:00