Commit graph

160589 commits

Author SHA1 Message Date
Harin Vadodaria
3ce85548bd Bug#20201864 : UPGRADE TO YASSL 2.3.7
Upgrading YaSSL from 2.3.5 to 2.3.7

Reviewed-by : Kristofer Pettersson <kristofer.pettersson@oracle.com>
Reviewed-by : Vamsikrishna Bhagi <vamsikrishna.bhagi@oracle.com>
2014-12-30 16:15:03 +05:30
s.sujatha
5da083ef67 Bug#20041860: SLAVE ERROR WHEN DROP DATABASE
Fix:
===
Backport Bug#11756194 to mysql-5.5. slave breaks if
'drop database' fails on master and mismatched tables on
slave.

'DROP TABLE <deleted tables>' was binlogged when
'DROP DATABASE' failed and at least one table was deleted
from the database. The log event would lead slave SQL thread
stop if some of the tables did not exist on slave.

After this patch, It is always binlogged with 'IF EXISTS'
option.
2014-12-29 12:17:55 +05:30
Rich Prohaska
4197cc130b Merge branch 'master' into releases/tokudb-7.5 2014-12-28 11:38:14 -05:00
Rich Prohaska
9ca5e1069a Merge branch 'master' into releases/tokudb-7.5 2014-12-28 11:38:14 -05:00
Jan Lindström
5fafc3ce42 MDEV-7369: MariaDB build fails when XTRADB_STORAGE_ENGINE enabled
Patch by James Taylor.
2014-12-28 13:24:53 +02:00
Thiru
901ce5314b Bug #20144839 AFTER UPDATING TO MYSQL 5.6.22 SERVER
CRASHES ON EVERY START ATTEMPT

Description:
------------
push_warning_printf function is used to print the warning message
to the client. So this function should not invoke while recovering
the server. Moreover current_thd is NULL while starting the server.

Solution:
---------
 - Avoiding the warning to be printed while recovery.
This patch already pushed in mysql-5.6.
2014-12-24 15:22:10 +05:30
Elena Stepanova
8051205d6f Increased the version number 2014-12-23 21:21:23 +04:00
Thiru
e7391e472e Bug #19815702 TIS620: CRASH WITH MULTI TABLE DELETE
- Moving the test case to correct place.
2014-12-22 13:33:48 +05:30
Rich Prohaska
b9d154c564 DB-766 use an extra flag that is supported on MySQL and does not require a tokutek patch to the wait_while_table_is_used function 2014-12-21 19:15:39 -05:00
Rich Prohaska
de9a378646 DB-766 use an extra flag that is supported on MySQL and does not require a tokutek patch to the wait_while_table_is_used function 2014-12-21 19:15:39 -05:00
unknown
3818bbb0cb Adding mariadb-version on the view creation to view frm. (MDEV-6916 followup) 2014-12-21 19:23:28 +01:00
Rich Prohaska
09f905c57a add sysbench update perf graph 2014-12-21 11:24:49 -05:00
Rich Prohaska
1429a11b56 add sysbench update perf graph 2014-12-21 11:24:49 -05:00
Rich Prohaska
88a29be67b add sysbench update perf graph 2014-12-21 11:10:53 -05:00
Rich Prohaska
355fc0f729 add sysbench update perf graph 2014-12-21 11:10:53 -05:00
Rich Prohaska
085f11aa02 add sysbench update perf graph 2014-12-21 10:51:19 -05:00
Rich Prohaska
1a7a60d1e6 add sysbench update perf graph 2014-12-21 10:51:19 -05:00
Rich Prohaska
0c1386187c add sysbench update graphs 2014-12-21 10:39:23 -05:00
Rich Prohaska
49577736b8 add sysbench update graphs 2014-12-21 10:39:23 -05:00
Rich Prohaska
609b5d1b09 add sysbench update perf graph 2014-12-21 07:24:36 -05:00
Rich Prohaska
f7a7e89288 add sysbench update perf graph 2014-12-21 07:24:36 -05:00
Sergey Vojtovich
260727adc6 Fixed yet another compiler warning. 2014-12-19 23:42:22 +04:00
Sergey Vojtovich
094640c036 Fixed a couple of compiler warnings. 2014-12-19 23:17:59 +04:00
Sergei Golubchik
0f64a927a9 merge 2014-12-19 11:44:03 +01:00
Sergei Golubchik
a978bdda1e mysql-5.5.41 merge 2014-12-19 11:35:44 +01:00
Sergey Petrunya
13e1acc58f Merge 5.3 -> 5.5 2014-12-18 20:38:47 +03:00
Sergey Petrunya
b75090c7de MDEV-6830: Server crashes in best_access_path after a sequence of SELECTs ...
generate_derived_keys_for_table() did not work correctly in the case where
- it had a potential index on derived table
- however, TABLE::check_tmp_key() would disallow creation of this index 
  after looking at its future key parts (because of the key parts exceeding 
  max. index length)
- the code would leave a KEYUSE structure that refers to a non-existant index.
  Depending on further optimizer calculations, this could cause a crash.
2014-12-18 20:06:49 +03:00
Sergei Golubchik
724dbaabc0 MDEV-7150 Wrong auto increment values on INSERT .. ON DUPLICATE KEY UPDATE when the inserted columns include NULL in an auto-increment column
when restoring auto-inc value in INSERT ... ON DUPLICATE KEY UPDATE, take into account that
1. it may be changed in the UPDATE clause (old code did that)
2. it may be changed in the INSERT clause and then cause a dup key (old code missed that)
2014-12-18 00:13:16 +01:00
Rich Prohaska
c6b5bf7758 Merge branch 'master' into releases/tokudb-7.5 2014-12-17 16:45:08 -05:00
Rich Prohaska
f2b659f604 Merge branch 'master' into releases/tokudb-7.5 2014-12-17 16:45:08 -05:00
Rich Prohaska
6714ec1247 DB-783 append -Wvla to compiler flags to allow variable length arrays to be used in tokudb 2014-12-17 16:44:02 -05:00
Rich Prohaska
59f2e81769 DB-783 append -Wvla to compiler flags to allow variable length arrays to be used in tokudb 2014-12-17 16:44:02 -05:00
Rich Prohaska
03a0eb3f7b FT-635 adjust test result with new status variable 2014-12-17 10:48:34 -05:00
Rich Prohaska
612d7a87a0 FT-635 adjust test result with new status variable 2014-12-17 10:48:34 -05:00
unknown
a4ff2afcb4 cleanup 2014-12-17 14:38:14 +01:00
unknown
ff5349bd6c MDEV-6985: MariaDB crashes on stored procedure call
Item_ident fixed to allow double cleanup().
2014-12-17 14:35:13 +01:00
Alexander Barkov
357cb12d87 DEV-7221 from_days fails after null value 2014-12-16 15:33:13 +04:00
Rich Prohaska
8e193934c0 FT-635 count the number of deleted leaf entries that are skipped by a cursor search
Conflicts:
	ft/ft-ops.cc
2014-12-15 16:02:10 -05:00
Michael Widenius
5257d71e0e MDEV-6855 Assertion `cond_type == Item::FUNC_ITEM' failed in check_group_min_max_predicates with GROUP BY, aggregate in WHERE SQ, multi-part key
mysql-test/r/group_by.result:
  Test for MDEV-6855
mysql-test/t/group_by.test:
  Test for MDEV-6855
sql/item.h:
  Fixed spelling error
sql/opt_range.cc:
  Added handling of cond_type == Item::CACHE_ITEM in WHERE clauses for MIN/MAX optimization.
  Fixed indentation
2014-12-15 17:13:47 +02:00
Michael Widenius
10ab3e6887 MDEV-4010 Deadlock on concurrent INSERT .. SELECT into an Aria table with statement binary logging
There was a bug in lock handling when mixing INSERT ... SELECT on the same table.


mysql-test/suite/maria/insert_select.result:
  Test case for MDEV_4010
mysql-test/suite/maria/insert_select.test:
  Test case for MDEV_4010
mysys/thr_lock.c:
  We wrongly alldoed TL_WRITE_CONCURRENT_INSERT when there was a TL_READ_NO_INSERT lock
2014-12-15 14:49:23 +02:00
Michael Widenius
80ee57a30a MDEV-6896 kill user command cause MariaDB crash
mysql-test/r/kill-2.result:
  test case for MDEV-6896
mysql-test/t/kill-2-master.opt:
  test case for MDEV-6896
mysql-test/t/kill-2.test:
  test case for MDEV-6896
sql/sql_parse.cc:
  Use host_or_ip instead of host as host may be 0
2014-12-15 13:01:11 +02:00
Michael Widenius
4a32d9c058 MDEV-6871 Multi-value insert on MyISAM table that makes slaves crash (when using --skip-external-locking=0)
Problem was that repair() did lock and unlock tables, which leaved already locked tables in wrong state

include/my_check_opt.h:
  Added option T_NO_LOCKS to disable locking during repair()
  Fixed duplicated bit T_NO_CREATE_RENAME_LSN
mysql-test/suite/rpl/r/myisam_external_lock.result:
  Test case for MDEV-6871
mysql-test/suite/rpl/t/myisam_external_lock-slave.opt:
  Test case for MDEV-6871
mysql-test/suite/rpl/t/myisam_external_lock.test:
  Test case for MDEV-6871
storage/maria/ha_maria.cc:
  Don't lock tables during enable_indexes()
  Removed some calls to current_thd
storage/myisam/ha_myisam.cc:
  Don't lock tables during enable_indexes()
  Removed some calls to current_thd
2014-12-15 11:16:33 +02:00
Nirbhay Choubey
743e2ae433 MDEV-6891: Addendum, update company name in copyright notice 2014-12-12 17:10:51 -05:00
Nirbhay Choubey
4ba6ee1b31 MDEV-6891: Update company name 2014-12-12 10:38:19 -05:00
Rich Prohaska
c2660182bb FT-633 build on osx 2014-12-12 09:43:31 -05:00
Rich Prohaska
c2a756dd77 FT-633 test case and bug fix for the data race between the lock request start and retry functions that results in a stall in the condition var broadcast 2014-12-12 09:43:15 -05:00
Rich Prohaska
82aa575383 Merge branch 'master' into releases/tokudb-7.5 2014-12-12 09:35:17 -05:00
Rich Prohaska
6218a298fa Merge branch 'master' into releases/tokudb-7.5 2014-12-12 09:35:17 -05:00
Rich Prohaska
f6d2798f8a relax the time constraints on the bulk fetch tests again 2014-12-12 09:21:08 -05:00
Rich Prohaska
71764ccb4e relax the time constraints on the bulk fetch tests again 2014-12-12 09:21:08 -05:00