Commit graph

85695 commits

Author SHA1 Message Date
Sergei Golubchik
9d5731ef1b fix the test 2014-02-14 11:14:10 +01:00
Sergei Golubchik
8a26d19088 record incorrect result for MDEV-5539 Empty results in UNION with Sphinx engine
(just to have the test in the tree when we merge the upstream fix)
2014-02-14 10:39:25 +01:00
Rich Prohaska
a8ca3e2ab3 #184 fix mismatch between table_share->key_parts and the number really there. mysql increments key_parts for the extended keys. 2014-02-13 20:13:36 -05:00
Sergei Golubchik
12253abadb MDEV-714 LP:1020645 - crash (sig 11) with union query
Don't ignore the error from st_select_lex_unit::optimize()
2014-02-13 20:21:57 +01:00
Sergei Golubchik
4b57720caa use a different error for MySQL bug#11747970 - kill the query,
as it was supposed to be in bug#11747970, don't fake an error.
(this kill can be useful for other bugs too)
2014-02-13 20:20:17 +01:00
Sergei Golubchik
642495345f Remove the fix from MySQL-5.1 that's not necessary in 5.3 2014-02-13 20:18:07 +01:00
John Esmet
3c0a9bcedd refs #145 capture the node's height before calling finalize(), which is
the last point we may read the node variable safely.
2014-02-13 12:35:19 -05:00
Sergei Golubchik
913beda8c8 5.2 merge 2014-02-13 10:15:03 +01:00
Sergey Vojtovich
bde11c1ab5 MDEV-5089 - possible deadlocks between rwlocks and mutexes
Pre-MDL versions had direct relationship between LOCK_open and
LOCK_global_system_variables, e.g.:
  intern_sys_var_ptr // locks LOCK_global_system_variable
  mysql_sys_var_char
  create_options_are_valid
  ha_innobase::create
  handler::ha_create
  ha_create_table
  rea_create_table
  mysql_create_table_no_lock // locks LOCK_open
  mysql_create_table

With MDL this relationship was removed, but mutex order was still
recorded. In fact there is indirect relationship between LOCK_open
and LOCK_global_system_variables via rwlocks in reverse order.

Removed LOCK_open and LOCK_global_system_variables order recording,
instead assert that LOCK_open is never held in intern_sys_var_ptr().

This solves only one of many problems detected with MDEV-5089.
2014-02-13 11:40:49 +04:00
Sergey Petrunya
b0b699dc27 Debugging aid: Add T* List<T>::elem(int n) which returns N-th element in the list.
- There was List<N>::nth_element() but it didn't work because linker removed it. 
- Now, removal by linker is prevented for important values of T, and function is renamed.
2014-03-11 19:07:02 +01:00
Sergey Petrunya
5611c0e29d Merge 2014-03-11 17:14:48 +01:00
Sergey Petrunya
cb5b6c7e39 MDEV-5177: ha_partition and innodb index intersection produce fewer rows (MySQL Bug#70703)
(This is attempt at fix #2) (re-commit with fixed typo)
- Moved the testcase from partition_test to partition_innodb.test where it can really work.
- Made ordered index scans over ha_partition tables to satisfy ROR property for 
  the case where underlying table uses extended keys.
2014-03-11 16:45:08 +01:00
Michael Widenius
f031f0ae67 Fixed test failure (5.5 had different test result than 10.0) 2014-03-11 17:37:46 +02:00
Michael Widenius
800a278fd0 Fixed a compiler failure and removed some warnings in windows
extra/replace.c:
  Removed compiler warning
sql/unireg.cc:
  Removed compiler warning
storage/maria/ma_blockrec.c:
  Removed compiler warning
storage/maria/ma_dynrec.c:
  Fixed compiler failure
storage/maria/ma_unique.c:
  Removed compiler warning
storage/myisam/mi_check.c:
  Removed compiler warning
storage/myisam/mi_checksum.c:
  Removed compiler warning
2014-03-11 16:53:24 +02:00
Michael Widenius
599eb0dc86 Fixed MDEV-5724 "Server crashes on SQL select containing more group by and left join statements using innodb tables"
The problem was that a big record was allocated on the stack, which casued stack to run out.
  
Fixed by using my_safe_alloca() instead of my_alloca() when allocating records.
Now only records <= 16384 are allocated on the stack.

mysql-test/r/stack-crash.result:
  Added test case
mysql-test/t/stack-crash.test:
  Added test case
storage/maria/ma_blockrec.c:
  Use my_safe_alloca() instead of my_alloca()
storage/maria/ma_dynrec.c:
  Use my_safe_alloca() instead of my_alloca()
storage/maria/maria_def.h:
  Added MARIA_MAX_RECORD_ON_STACK
storage/maria/maria_pack.c:
  Use my_safe_alloca() instead of my_alloca()
2014-03-10 21:40:27 +02:00
unknown
33a8afd8ef MDEV-5703: [PATCH] Slave disconnects and fails to reconnect on Error_code: 1159
Patch from Tomas Matejicek

Add missing error code to is_networ_error(), to allow slave to
automatically attempt reconnection also in this case.
2014-03-04 20:50:19 +01:00
Sergey Petrunya
bc96ce5509 MDEV-5723: mysqldump -uroot unusable for multi-database operations, checks all databases
- MariaDB-5.5 part of the fix: since we can't easily fix query optimization for I_S tables, 
  run the affected-tablespaces query with semijoin=off. It happens to have a good query plan
  with that setting.
2014-03-04 16:15:58 +04:00
Alexey Botchkov
7449c7d32b MDEV-5756 Add Audit Plugin to Debian packaging. 2014-02-28 00:41:08 +04:00
Alexey Botchkov
3f3a84f46e MDEV-5436 mysqld crash signal 11 in mysql_audit_general.
That error 'Can't open the pid file' leads to mysqld crash signal 11 in mysql_audit_general() called
   with the 'thd' parameter set to NULL. That wasn't checked when the thd->db and thd->db_length
   were accessed. Fixed by checking for the NULL thd.
2014-02-28 00:23:20 +04:00
Elena Stepanova
525c00c682 Increment the version number 2014-02-26 16:25:05 +04:00
Jan Lindström
752ba087c8 MDEV-5746: Slow file extend when innodb_use_fallocate=1 and SSD
file storage.

Analysis: posix_fallocate was called using 0 as offset and len as
desired size. This is not optimal for SSDs.

Fix: Call posix_fallocate with correct offset i.e. current file size
and extend the file from there len bytes.
2014-02-26 13:49:50 +02:00
Jan Lindström
e479829a15 MDEV-5742: Assertion failure node->n_pending on fil0fil.c line 5039
on debug build when innodb_use_fallocate=1

Analysis: There was merge error that caused additional call to 
fil_node_complete_io.

Fixed by removing incorrect call and fixed calculation of extended
file size.
2014-02-26 12:06:12 +02:00
Alexey Botchkov
222e73c7a1 MariaDB Audit plugin added. 2014-02-24 23:40:16 +04:00
Sergei Golubchik
ff2e82f4a1 5.3 merge 2014-02-22 22:51:20 +01:00
Sergei Golubchik
004642525d Fix "cmake . && cmake -DWITHOUT_TOKUDB=1" to disable tokudb 2014-02-21 23:42:29 +01:00
Sergei Golubchik
74feebcd43 MDEV-5624 mysqldump --dump-slave option does not restart the replication if the dump has failed 2014-02-21 00:53:02 +01:00
Sergei Golubchik
ea0915dcad federatedx: avoid unnecessary bzero. improve dbug traces 2014-02-21 00:52:58 +01:00
Sergei Golubchik
e840d323e2 MDEV-5698 Using ORDER BY in a FederatedX table is abnormally slow
In ::position() federated needs to know an element before the
current ("data_cursor") in the single-linked list. Replace list
traversal for every ::position() call (which is O(n^2)) with remembering
the current element before it's advanced by mysql_fetch_row().

storage/federatedx/federatedx_io_mysql.cc:
  mdev:5698
2014-02-21 00:52:50 +01:00
Sergei Golubchik
62f3552390 MDEV-5609 create new test ssl certificates
Use 20-year ssl certificates for mysql-test from RedHat patch
2014-02-19 21:40:34 +01:00
Sergei Golubchik
d81d13f177 MDEV-5390 doesn't install on fedora if mysql is installed, part 2
On fedora:
1. provide/obsoleve mariadb-* packages
2. MariaDB-common conflicts with mariadb-libs (on filesystem level),
   but does not provide or obsolete it.
2014-02-19 21:40:25 +01:00
Sergei Golubchik
de8f29bd3a RPM:
* readability fixes
* CPackRPM wrapper to fix property leakage between components (cmake bug 13248)
2014-02-19 21:40:20 +01:00
Sergei Golubchik
11d27996e4 increment and get the query_id atomically, otherwise two concurrent threads
might end up having the same query id
2014-02-19 21:40:15 +01:00
Sergei Golubchik
afcd7091a0 MDEV-5529 Sync libmysqlclient.so symbol versioning across distributions
An attempt to introduce libmysqlclient.so symbol versioning that is
compatible both with Debian and Fedora all versions: put all symbols into
libmysqlclient_18 version node (as on Debian), but also put aliases of
old symbols into libmysqlclient_16 version node (as on Fedora).

Also use a linker script to create aliases of exported symbols, not
rpm_support.cc source file.
2014-02-19 21:39:16 +01:00
Sergei Golubchik
b1966435c2 MDEV-5580 /etc/init.d/mysql exits too early
Wait until the server starts accepting connections, not until the pid file appears
2014-02-17 11:10:30 +01:00
Sergei Golubchik
7b9c7c18d0 MDEV-5654 Server crashes on second installation of daemon_example plugin
daemon plugin: join the thread to make sure it exits before the plugin is unloaded
2014-02-17 11:10:26 +01:00
Sergei Golubchik
7131282464 At --log-warnings=9 or more, log at what address a dynamic plugin was loaded.
It helps to interpret valgrind/safemalloc memory-related warnings that are
printed when a plugin is unloaded (and thus cannot resolve addresses automatically)
2014-02-17 11:10:22 +01:00
Sergei Golubchik
3febb3ce1d mtr: smarter check for usable ipv6.
Handles the case of
sysctl net.ipv6.conf.all.disable_ipv6=1 net.ipv6.conf.default.disable_ipv6=1
2014-02-17 11:10:18 +01:00
Sergei Golubchik
5f1a2cf8e3 errmsg.sys files are located in the builddir, not in the srcdir 2014-02-17 11:10:14 +01:00
Sergei Golubchik
cb324d91ad MDEV-5579 rpm postun scriptlet leaks exit code to rpm 2014-02-17 11:10:03 +01:00
Sergei Golubchik
95f4bf1857 MDEV-5613 m_string.h exports generic function names without a namespace prefix, like str2int
don't include m_string. in my_valgrind.h
2014-02-17 11:09:57 +01:00
Sergei Golubchik
ce4d5fe53c RPM: fix alternative provides/obsoletes - put the correct architecture and version 2014-02-17 11:09:50 +01:00
Sergei Golubchik
8c718bf595 MDEV-5436 mysql_config returns non-zero when running without parameters 2014-02-17 11:09:45 +01:00
Sergey Vojtovich
5d6e756cd1 send_eval may free evaluated query buffer before connection thread
actually consumed it. With this patch evaluated query buffer is freed
along with query buffer.

The problem was uncovered by udf_debug_sync.test when it was run with
--embedded.
2014-02-18 10:54:05 +04:00
Sergey Petrunya
fd9e34ffd7 Post-merge fixes: merge MariaDB's fix for MDEV-5177 and MDEV-5555
with Oracle's fix for Bug#17588348 by reverting Oracle's fix.
2014-02-17 23:20:07 +04:00
Sergey Petrunya
b594e31b6b Merge 2014-02-17 18:53:54 +04:00
Sergey Petrunya
df963fd3c7 MDEV-5177: ha_partition and innodb index intersection produce fewer rows (MySQL Bug#70703)
MDEV-5555: Incorrect index_merge on BTREE indices
- In ha_partition, make ordered index reads return rows in rowid order
  when index columns are the same.
2014-02-17 18:50:54 +04:00
Sergei Golubchik
c8abf3e6de don't open and fill all I_S tables for SELECT * FROM I_S.TRIGGERS 2014-02-17 11:09:40 +01:00
Sergei Golubchik
84c96a263e different fix for internal Oracle MySQL bug#16324629 that doesn't crash
(simply, copied from FederatedX)
2014-02-17 11:09:33 +01:00
Sergei Golubchik
4881c65007 test case for
MDEV-5689 ExtractValue(xml, 'substring(/x,/y)') crashes
MySQL bug#12428404 MYSQLD.EXE CRASHES WHEN EXTRACTVALUE() IS CALLED WITH MALFORMED XPATH EXP
2014-02-17 11:09:24 +01:00
Sergei Golubchik
84651126c0 MySQL-5.5.36 merge
(without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
2014-02-17 11:00:51 +01:00