Commit graph

171586 commits

Author SHA1 Message Date
Vicentiu Ciorbaru
0880284bf7 Fix win/ files to be stored with LF in repository
On Windows, the files get checked out with CRLF thanks
to .gitattributes.
2015-05-08 17:06:35 +03:00
Sergei Golubchik
c1b07ff9b7 update .gitattributes 2015-05-08 11:56:48 +02:00
Sergei Golubchik
b5c5f3176a convert files from CRLF to LF line endings 2015-05-08 11:48:16 +02:00
Sergei Golubchik
e774008b04 bump the VERSION 2015-05-08 11:48:02 +02:00
Sergei Golubchik
ac286a9bc7 Merge branch '5.5' into 10.0 2015-05-08 11:20:43 +02:00
Alexander Barkov
91ee98a8c8 MDEV-7807 information_schema.processlist truncates queries with binary strings
Adding a new column INFORMATION_SCHEMA.PROCESSLIST.INFO_BINARY.
2015-05-08 00:34:06 +04:00
Sergei Golubchik
0014bdc7ee MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEW
on REPAIR don't do table-specific stuff for views
(because even if the view has a temp table opened for it,
it's not opened all the way down the engine. In particular,
Aria crashes in maria_status() because MARIA_HA* info - that is
table->table->file->file - is NULL)
2015-05-07 22:18:34 +02:00
Sergey Vojtovich
0fcc350f73 MDEV-7922 - ERROR 1939 (HY000): Engine PERFORMANCE_SCHEMA failed to discover
table

Performance schema discovery fails if connection has no active database set.

This happened due to restriction in SQL parser: table name with no database name
is ambiguous in such case.

Fixed by temporary substitution of default database with being discovered table
database.
2015-05-07 20:45:46 +04:00
Jan Lindström
3832bda1ba Fix compiler error if compiler does not support c99 style
initializers.
2015-05-07 18:30:42 +03:00
Sergey Vojtovich
7ed673f35c MDEV-7793 - Race condition between XA COMMIT/ROLLBACK and disconnect
XA COMMIT/ROLLBACK of XA transaction owned by different thread may access
freed memory if that thread disconnects at the same time.

Also concurrent XA COMMIT/ROLLBACK of recovered XA transaction were not
serialized properly.
2015-05-07 16:48:30 +04:00
Jan Lindström
8350ea0514 Fix compiler error if compiler does not support c99 style
initializers.
2015-05-07 13:04:03 +03:00
Alexander Barkov
a1ad712152 Fixing connect.dbf test failures on big endian machines. 2015-05-07 07:39:45 +04:00
Jan Lindström
b975685036 Merge pull request #54 from openquery/MDEV-8053-c99-style-for-structure-members-10.1
c99 style for assigning structure members
2015-05-06 16:48:17 +03:00
Jan Lindström
f704b3335f Merge pull request #52 from openquery/MDEV-8053-c99-style-for-structure-members
c99 style for assigning structure members
2015-05-06 16:47:23 +03:00
Jan Lindström
bad81f23f6 MDEV-8046: Server crashes in pfs_mutex_enter_func on select from I_S.INNODB_TABLESPACES_ENCRYPTION if InnoDB is disabled
Problem was that information schema tables innodb_tablespaces_encryption and
innodb_tablespaces_scrubbing where missing required check is InnoDB enabled
or not.
2015-05-06 15:16:28 +03:00
Jan Lindström
2f25c653ad MDEV-8074: Failing assertion: mutex->magic_n == MUTEX_MAGIC_N in file sync0sync.cc line 508
Problem was that e.g. on crash recovery fil_space_crypt_close_tablespace
and fil_space_crypt_mark_space_closing access mutex that is not yet
initialized. Mutex is naturally initialized only if encryption is
configured.
2015-05-06 14:11:30 +03:00
Kristian Nielsen
31c069eb4d Merge MDEV-8103 into 10.1 2015-05-06 12:46:33 +02:00
Kristian Nielsen
5c833689ac Merge MDEV-8103 into 10.0 2015-05-06 12:41:21 +02:00
Kristian Nielsen
ef99edf1a8 MDEV-8103: Missing DBUG_RETURN in open_table_uncached() 2015-05-06 12:24:15 +02:00
Sergei Golubchik
b9c89ad038 Merge branch 'Buggynours:10.0' into 10.0 2015-05-05 22:37:00 +02:00
Olivier Bertrand
a82f475bdd - Fix a regression bug on (XML) HTML tables.
modified:
  tabxml.cpp
added:
  xml_html.test
  xml_html.result
  beers.xml
  coffee.htm

- Fix MDEV-7935 by suppressing error resetting code in delete_or_rename_table.
  However, the issue is that this code was added because without it an assertion
  was raised in some cases. Unfortunately I can't remember what were these cases.
  Therefore fixing it in this case will perhaps make a new crash happening on another cases.
modified:
  ha_connect.cc

- Add the UDF Json_Array_Delete.
modified:
  jsonudf.cpp
2015-05-05 22:05:09 +02:00
Sergei Golubchik
c09c265ac4 Fix MDEV-8090 in tabmysql.cpp 2015-05-05 22:05:05 +02:00
Sergei Golubchik
95797b9677 MDEV-8096 vio timeouts are multiplied by 1000 for ssl
in when using vio->read_timeout (and write_timeout) to set
timeouts of a new vio, as in:

  vio_timeout(vio, 0, old_vio.read_timeout)
  vio_timeout(vio, 0, old_vio.write_timeout)

remember that timeouts are stored in ms, but vio_timeout()'s
argument is in seconds.
2015-05-05 21:56:46 +02:00
Vicențiu Ciorbaru
d3a3adb833 MDEV-7985: MySQL Users Break when Migrating to MariaDB, part 2
Gave priority to password field when using a native authentication
plugin.

Also, prevented a user from setting an invalid auth_string, when using
native authentication.
2015-05-05 22:50:32 +03:00
Sergei Golubchik
7b70b0d4a9 Merge branch 'bb-10.0-serg' into 10.0 2015-05-05 16:31:53 +02:00
Sergei Golubchik
93047370a6 mroonga doesn't work in embedded anymore
specify RECOMPILE_FOR_EMBEDDED and disable tests in suite.pm
2015-05-05 16:28:23 +02:00
Sergei Golubchik
1d3ea9ecd8 perfschema 5.6.24
including the big commit
  commit 305130361bf72726de220f3d2b2787395e10be61
  Author: Marc Alff <marc.alff@oracle.com>
  Date:   Tue Feb 10 11:31:32 2015 +0100

      WL#8354 BACKPORT DIGEST IMPROVEMENTS TO MYSQL 5.6

(with the following commits) and related changes in sql/
2015-05-05 15:23:47 +02:00
Alexander Barkov
e4fde092c6 Temporarily disabling Mroonga on Solaris
(See MDEV-7440 Build fails in libgroonga on Solaris)
2015-05-05 15:39:32 +04:00
Alexander Barkov
73c2356e7b MDEV-7778 impossible create copy of table, if table contain default value for timestamp field
MDEV-8082 ON UPDATE is not preserved by CREATE TABLE .. SELECT
2015-05-05 13:22:09 +04:00
Sergei Golubchik
dd0207bda4 .gitignore: add generated mroonga *.result files
and remove duplicates
2015-05-05 08:53:52 +02:00
Sergei Golubchik
d08b7ed514 Merge branch 'Kentoku:10.0' into 10.0 2015-05-05 08:19:20 +02:00
Kentoku SHIBA
d4dd936bd7 Merge branch 'ks-Mroonga-5.02' into 10.0 2015-05-05 16:26:45 +09:00
Sergei Golubchik
5dcb111c38 Merge branch 'Buggynours:10.0' into 10.0 2015-05-05 07:50:31 +02:00
Alexander Barkov
539b3ca87d - Moving Item_func_spatial_mbr_rel from Item_bool_func2 to Item_bool_func,
as Item_func_spatial_mbr_rel needs nothing from Item_bool_func2.
- Renaming Item_func_spacial_rel (the class that implements precise spacial
  relations) to Item_func_spatial_precise_rel
- Adding a new abstract class Item_func_spatial_rel as a common parent
  for Item_func_spatial_precise_rel and Item_func_spatial_mbr_rel.
2015-05-05 09:30:17 +04:00
Kentoku SHIBA
872cbb806b revert CMakeList.txt at groonga-normalizer-mysql/normalizers 2015-05-05 13:48:54 +09:00
Sergei Golubchik
bbcc8e6924 XtraDB-5.6.23-72.1 2015-05-05 00:08:58 +02:00
Sergei Golubchik
70a3fec400 InnoDB-5.6.24 2015-05-05 00:06:23 +02:00
Alexander Barkov
2fe4d0e6cd MDEV-7950 Item_func::type() takes 0.26% in OLTP RO
Step #3: Splitting the function check_equality() into a method in Item.
Implementing Item::check_equality() and Item_func_eq::check_equality().
Implement Item_func_eq::build_equal_items() in addition to
Item_func::build_equal_items() and moving the call for check_equality()
from Item_func::build_equal_items() to Item_func_eq::build_equal_items().
2015-05-05 01:09:47 +04:00
Kentoku SHIBA
d33cef1cb0 add -fPIC for groonga-normalizer-mysql 2015-05-05 05:26:06 +09:00
Sergei Golubchik
0b4f5060bb Merge branch 'merge-pcre' into 10.0 2015-05-04 22:25:57 +02:00
Sergei Golubchik
c4cc91cdc9 8.37 2015-05-04 22:19:22 +02:00
Sergei Golubchik
a4416abdde 5.6.23-72.1 2015-05-04 22:17:04 +02:00
Sergei Golubchik
d71d411905 5.6.24 2015-05-04 22:16:00 +02:00
Sergei Golubchik
085297a121 5.6.24 2015-05-04 22:13:46 +02:00
Sergei Golubchik
6c5ee86286 Null-merge branch 'merge-xtradb-5.6' into 10.0 2015-05-04 22:09:21 +02:00
Sergei Golubchik
41e8126b8f Null-merge branch 'merge-sphinx' into 10.0 2015-05-04 22:08:06 +02:00
Sergei Golubchik
18b9f48ef5 Null-merge branch 'merge-innodb-5.6' into 10.0 2015-05-04 22:05:39 +02:00
Sergei Golubchik
49c853fb94 Merge branch '5.5' into 10.0 2015-05-04 22:00:24 +02:00
Kentoku SHIBA
9130cc7f3c update Spider to 3.2.21 2015-05-05 03:09:34 +09:00
Kentoku SHIBA
d18beccc1d add -fPIC for groonga-normalizer-mysql 2015-05-05 02:43:19 +09:00