Commit graph

85813 commits

Author SHA1 Message Date
Michael Widenius
55829ac13d Support 6 digit version numbers in executable comment syntax.
This is needed to be able to ignore executable comments from version 10.0.
2014-02-11 21:43:08 +02:00
John Esmet
ec1dc2dc22 fixes #170 Add compression ratio engine status values for leaf/nonleaf
disk bytes written. Need to add a 'double' engine status type, which
apparnetly exists in the union, but not as a type tag.
2014-02-11 14:28:08 -05:00
Rich Prohaska
d06d73633d #181 fix memory leak of the inserted bytes partitioned counter 2014-02-11 14:24:02 -05:00
Michael Widenius
1bdf2151da Fixed MDEV-5617: mysqld crashes when running a query with ONLY_FULL_GROUP_BY
Problem was that we used cache_table in some cases where it was not initialized

mysql-test/r/func_group.result:
  Added test case
mysql-test/t/func_group.test:
  Added test case
sql/item.cc:
  Don't use cached_table if not set
sql/item_sum.cc:
  Don't use cached_table
2014-02-11 16:58:49 +02:00
Michael Widenius
2d48e9f11c Fixed failing test case 2014-02-11 16:57:28 +02:00
Michael Widenius
67e8e926e9 Set default progress report time to 5 seconds
(Had accidently been set to 56 seconds in some merge)


sql/sys_vars.cc:
  Set default progress report time to 5 seconds
2014-02-11 16:56:38 +02:00
Michael Widenius
5785b1a05c Enable rpl_row_create_table (no reason to keep this disabled anymore) 2014-02-11 14:03:13 +02:00
Michael Widenius
12bbf03cff Fix for MDEV-5629: Failing assertion: state == TRX_STATE_NOT_STARTED on concurrent CREATE OR REPLACE and transactional UPDATE
mysql-test/suite/innodb/r/row_lock.result:
  Test case for MDEV-5629
mysql-test/suite/innodb/t/row_lock.test:
  Test case for MDEV-5629
sql/filesort.cc:
  Don't call unlock_row() in case of errors
2014-02-11 14:02:42 +02:00
sayantan dutta
cebe93dc5b Bug #18027288 - MTR SUITE ABORTS WHEN A CLIENT TRIES TO CONNECT SERVER WITH A WRONG PORT NUMBER 2014-02-11 17:15:50 +05:30
Annamalai Gurusami
6193c63211 Bug#18185930 UPD_NODE_INSERT_BLOB CAUSES BTR_EXTERN_OWNER_FLAG ASSERTION
Problem:

In the clustered index, when an update operation is done the overall
scenario (after rb#4479) is as follows:

1.  Delete mark the old record that is to be updated.
2.  The old record disowns the blobs.
3.  Insert the new record into clustered index.
4.  For non-updated blobs, new record must own it. Verified by assert.
5.  For non-updated blobs, in new record marked as inherited.

Scenario involving DB_LOCK_WAIT:

If step 3 times out, then we will skip 1 and 2 and will continue from
step 3.  This skipping is achieved by the UPD_NODE_INSERT_BLOB state.
In this case, step 4 is not correct.  Because of step 1, the new
record need not own the blobs.  Hence the assert failure.

Solution:

The assert in step 4 is removed.  Instead code is added to ensure that
the record owns the blob.  

Note:

This is a regression caused by rb#4479.

rb#4571 approved by Marko
2014-02-11 16:44:37 +05:30
unknown
dd7ac46801 MDEV-5607: Query cache destroys uninitialized rwlock
Destroying rw_lock twice by resize() prevented.
2014-02-11 10:32:52 +02:00
Balasubramanian Kandasamy
a584490989 - Add support for el7 (with systemd enabled)
- Enable shared libmysqld by cmake option
2014-02-11 08:27:00 +01:00
Nirbhay Choubey
e0f0f5f6d0 Reverting the change erroneously got introduced during merge. 2014-02-10 23:54:18 -05:00
Igor Babaev
6ce2135f5d Merge 2014-02-10 20:34:52 -08:00
Igor Babaev
f17079fa7e Merge 5.3->5.5 2014-02-10 17:00:51 -08:00
Elena Stepanova
7258299774 Do not include .result~ files and such into packages 2014-02-10 23:53:04 +04:00
Thirunarayanan B
7acdf29cb4 Bug #14049391 INNODB MISCALCULATES AUTO-INCREMENT AFTER DECREASING
AUTO_INCREMENT_INCREMENT
Problem:
=======
When auto_increment_increment system variable decreases,
immediate next value of auto increment column is not affected.

Solution:
========
	Get the previous inserted value of auto increment column by
subtracting the previous auto_increment_increment from next
auto increment value. After that calculate the current autoinc value
using newly changed auto_increment_increment variable.

	Approved by Sunny [rb#4394]
2014-02-10 10:13:35 +05:30
John Esmet
3c2958a4b9 Merge branch 'releases/tokumx-1.4' 2014-02-08 18:02:04 -05:00
John Esmet
f7323d26d9 fixes #168 Run full garbage collection if promotion injects into a leaf
node and notices that it is over 32mb
2014-02-08 17:59:22 -05:00
Igor Babaev
3845a89b01 Merge 2014-02-07 16:55:25 -08:00
Igor Babaev
50b9e30b72 Fixed bug mdev-5611.
The method Item_field::update_table_bitmaps() should not try
to mark the bit for a self-referencing virtual column.
2014-02-07 15:50:36 -08:00
Sergey Petrunya
cfbc545d1a Merge 2014-02-07 23:57:55 +04:00
Rich Prohaska
dfe4872524 #180 avoid thd_proc_info pointing to invalid info (like when a function sets proc info with a local variable and then returns) 2014-02-07 12:58:10 -05:00
Rich Prohaska
b7e362e48c #178 clean up hatoku_defines.h a bit. it is a mess. 2014-02-07 12:07:53 -05:00
Sergey Petrunya
34b6f51dab MDEV-5582: Plugin 'MEMORY' has ref_count=1 after shutdown with materialization+semijoin
- Let cleanup_empty_jtbm_semi_joins() walk into semi-join nests.
2014-02-07 20:51:31 +04:00
Rich Prohaska
b6a43ff0e3 #153 change checkpoint lock tests to work with --ps-protocol 2014-02-07 11:27:36 -05:00
Rich Prohaska
c74cb7ee21 #176 use devtoolset-1.1 to build mysql and mariadb 2014-02-07 10:32:50 -05:00
Rich Prohaska
d94b22a2f9 #40 fix mod_enum test portability 2014-02-06 15:58:20 -05:00
Rich Prohaska
1fe96e2e52 #175 make the mod_enum test more portable 2014-02-06 08:45:07 -05:00
Murthy Narkedimilli
5ffe40022b Fixing the bug 18184414: WRONG COPYRIGHT TO FILE INCLUDE/MYSQL_VERSION.H.IN 2014-02-06 14:11:38 +05:30
Anirudh Mangipudi
10c190f076 Bug#14211271 ISSUES WITH SSL ON DEBIAN WHEEZY I386 AND KFREEBSD-I386
Problem:
It was reported that on Debian and KFreeBSD platforms, i386 architecture 
machines certain SSL tests are failing. main.ssl_connect  rpl.rpl_heartbeat_ssl
rpl.rpl_ssl1 rpl.rpl_ssl main.ssl_cipher, main.func_encrypt were the tests that
 were reportedly failing (crashing). The reason for the crashes are said to be
due to the assembly code of yaSSL.

Solution:
There was initially a workaround suggested i.e., to enable 
-DTAOCRYPT_DISABLE_X86ASM flag which would prevent the crash, but at an expense
 of 4X reduction of speed. Since this was unacceptable, the fix was the 
functions using assembly, now input variables from the function call using 
extended inline assembly on GCC instead of relying on direct assembly code.
2014-02-06 11:16:55 +05:30
Igor Babaev
5b441013e1 Fixed bug mdev-5468.
The field JOIN::select_lex->where should be updated after the call
of remove_eq_conds() in the function make_join_statistics(). This
matters for subselects.
2014-02-05 17:47:38 -08:00
Rich Prohaska
04b8c2f63c #177 disable inline alter table drop default, add key, drop key, rename column when null bytes changed 2014-02-05 15:38:06 -05:00
Rich Prohaska
e43c10cf60 #177 add result files for alter table tests that crash tokudb due to null bytes change 2014-02-05 13:28:52 -05:00
Rich Prohaska
a99499b660 #177 alter table tests that crash tokudb due to null bytes change 2014-02-05 12:02:08 -05:00
Elena Stepanova
41fd4844e8 unix_socket fails in some build environments when $USER variable
appears to be unset, or when it contains 'root' even though the user
does not have real root permissions
2014-02-05 14:25:37 +04:00
Nirbhay Choubey
4cb029b38b * Merged the missing revision 3934 from
codership-mysql/5.5 (missed in the last merge).
* Merged changes from Innodb to xtradb.
* Updated WSREP_PATCH_REVNO
2014-02-05 00:28:11 -05:00
Leif Walsh
9d3d681d04 Revert "Merge remote-tracking branch 'origin/ft-index/46merge-a'"
This reverts commit b1c1e93dc4, reversing
changes made to 60be90af92.
2014-02-04 11:08:30 -05:00
Leif Walsh
a03b9926d7 Merge remote-tracking branch 'origin/ft-index/46merge-a' 2014-02-04 10:37:07 -05:00
Tor Didriksen
8ab4177b03 Bug#18123048 ENABLE BUILD OF SHARED LIBMYSQLD ON LINUX
Added a new option: WITH_EMBEDDED_SHARED_LIBRARY
2014-02-04 15:34:36 +01:00
unknown
31d156673e 2014-02-04 09:01:06 +01:00
Nirbhay Choubey
7ca53d9479 Merging revisions 3934..3944 from codership-mysql/5.5. 2014-02-03 22:55:46 -05:00
Rich Prohaska
be8aa787db #175 compare enums using eq_def 2014-02-03 16:12:57 -05:00
Rich Prohaska
88f846d676 #175 test case for alter table modify enum 2014-02-03 16:06:31 -05:00
Rich Prohaska
b45c0f1ae7 #176 use devtoolset-1.1 to build mysql and mariadb 2014-02-03 14:25:55 -05:00
Kent Boortz
4f888fda53 Bug#11751526 / Bug#42421 - MYSQL_INSTALL_DB.PL NOT RELOCATABLE ON WINDOWS
Corrected how to find "resolveip"
2014-02-03 16:04:44 +01:00
Elena Stepanova
5fb973b020 Increment the version number 2014-02-01 02:41:12 +04:00
Rich Prohaska
8e26447aa3 #172 simplify test case for -30994 leak 2014-01-31 14:00:23 -05:00
Rich Prohaska
47e6cc1fd0 Tokutek/mysql#14 test case for drop pk gets invalid key prefix bug 2014-01-31 11:55:27 -05:00
unknown
a4209ce224 Merge from mysql-5.5.36-release 2014-01-31 13:32:25 +01:00