Commit graph

90819 commits

Author SHA1 Message Date
Nirbhay Choubey
96e505e4b7 MDEV-7319 : Galera bootstrap (/etc/init.d/mysql bootstrap)
returns code 0 on failure

Modified init script to return with proper exit status for
bootstrap command. [Based on Kenny Rasschaert's suggestion]
2014-12-20 19:58:54 -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
Michael Widenius
bc21e7a67f Fixed compiler warnings
scripts/mysql_system_tables.sql:
  Removed DEFAULT from a blob definition as this can cause problems.
2014-12-19 09:25:29 +02: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
Kristian Nielsen
826d7c68d2 MDEV-7342: Test failure in perfschema.setup_instruments_defaults
Fix a possible race in the test case when restarting the server.

Make sure we have disconnected before waiting for the reconnect
that signals that the server is back up. Otherwise, we may in
rare cases continue the test while the old server is shutting
down, eventually leading to "connection lost" failure.
2014-12-18 11:59:08 +01: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
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
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
Alexander Barkov
ea01fff505 Fixing test failures caused by the previous commits.
Adding "--source include/have_udf.inc" and a few "--replace" commands.
2014-12-16 15:31:25 +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
Alexander Barkov
2dbd26932d MDEV-7283 UDF: CREATE OR REPLACE, CREATE IF NOT EXISTS, DROP IF EXISTS
MDEV-7282 SP: CREATE OR REPLACE, CREATE IF NOT EXISTS
2014-12-15 17:41:15 +04: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
Olivier Bertrand
8761f22a11 - Temporary fix for MDEV-7304.
modified:
  storage/connect/rcmsg.c

- Avoid Memory copying when reading an ODBC table when the entire table
  is already in the result set.
modified:
  storage/connect/odbconn.cpp
  storage/connect/odbconn.h
  storage/connect/tabodbc.cpp
  storage/connect/tabodbc.h
2014-12-14 22:47:12 +01:00
Nirbhay Choubey
3a37c01334 MDEV-6891: Addendum, update company name in copyright notice 2014-12-12 17:16:11 -05:00
Nirbhay Choubey
fc1a7055a3 MDEV-6891: Addendum, update company name in copyright notice 2014-12-12 17:13:13 -05:00
Nirbhay Choubey
743e2ae433 MDEV-6891: Addendum, update company name in copyright notice 2014-12-12 17:10:51 -05:00
Nirbhay Choubey
48ed8ab215 MDEV-6891: Update company name 2014-12-12 10:58:38 -05:00
Nirbhay Choubey
756c6f74bf MDEV-6891: Update company name 2014-12-12 10:46:31 -05:00
Nirbhay Choubey
def5bd67ba MDEV-6891: Update company name 2014-12-12 10:40:27 -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
71764ccb4e relax the time constraints on the bulk fetch tests again 2014-12-12 09:21:08 -05:00
Kristian Nielsen
16fb2963ff Fix typo that breaks compilation on platforms without atomics. 2014-12-12 14:03:20 +01:00
Rich Prohaska
6c8963e9ea relax the time constraints on the bulk fetch tests 2014-12-11 19:59:48 -05:00
Elena Stepanova
263cf26e8b Increased the version number 2014-12-12 04:42:59 +04:00
Rich Prohaska
a25c436aa1 Merge branch 'master' into releases/tokudb-7.5 2014-12-11 13:23:03 -05:00
Alexander Barkov
0b936cda07 Using Schema_specification_st instead of HA_CREATE_INFO in a few places
where the former is enough.
2014-12-10 16:46:21 +04:00
Nirbhay Choubey
4f9f3d4391 empty revision 2014-12-10 06:24:56 -05:00
Jan Lindström
76c3981e43 Fix test case to allow success on create table (Windows). 2014-12-10 12:12:09 +02:00
Alexander Barkov
822eb6ca3d MDEV-7285 SERVER: CREATE OR REPLACE and CREATE IF NOT EXISTS 2014-12-10 13:41:14 +04:00
Alexander Barkov
14cfb0acb8 MDEV-6409 CREATE VIEW replication problem if error occurs in mysql_register_view
An additional debug test, made by Sriram Patil while working on
"CREATE VIEW IF NOT EXISTS".
2014-12-10 12:00:25 +04:00
Alexander Barkov
60277b8b3c MDEV-7287 VIEW: CREATE IF NOT EXISTS
Forgot to do "git add" for a number of files in the previous commit.
2014-12-10 11:32:52 +04:00
Alexander Barkov
acdc383445 MDEV-7287 VIEW: CREATE IF NOT EXISTS 2014-12-10 11:06:36 +04:00
Alexander Barkov
92a523e5d5 MDEV-7280 DATABASE: CREATE OR REPLACE
A clean-up: require CREATE+DROP privileges for "CREATE OR REPLACE DATABASE",
instead of just CREATE privilege.
2014-12-10 10:40:35 +04:00
Alexander Barkov
31c7458e1a MDEV-7280 DATABASE: CREATE OR REPLACE
A test clean-up: The "SHOW DATABASES" queries now use "LIKE 'db%'",
to display only the databases created during this test,
thus exclude the system databases, as some of them can be optional
(e.g. performance_schema).
2014-12-10 08:19:19 +04:00
Alexander Barkov
dd270e43bf MDEV-7280 DATABASE: CREATE OR REPLACE 2014-12-10 08:13:08 +04:00
Nirbhay Choubey
41367e4023 MDEV-7204: mariadb-galera-server el7 rpms packaging
issue, no mariadb-server in provides
MDEV-7233: Fix issue with missing dependency socat
           when installing MariaDB-galera-server on
           RedhatEL/OracleEL/(Others?) RPM based 

* Added mariadb-server to "provides" for MariaDB Galera
  server package. (rpm)
* Removed "socat" from MariaDB Galera server's mandatory
  dependency list. (rpm)
* Moved "socat" from mandatory to optional dependency. (deb)
2014-12-09 10:35:16 -05:00