Aleksey Midenkov
c59c1a0736
System Versioning 1.0 pre8
...
Merge branch '10.3' into trunk
2018-01-10 12:36:55 +03:00
Sergei Golubchik
e52a237fe9
remove ifdefs around PSI_THREAD_CALL
...
same change as for PSI_TABLE_CALL
2018-01-09 14:21:20 +03:00
Marko Mäkelä
145ae15a33
Merge bb-10.2-ext into 10.3
2018-01-04 09:22:59 +02:00
Marko Mäkelä
3fcbeb4a63
Merge 10.2 into bb-10.2-ext
2018-01-03 22:42:27 +02:00
Marko Mäkelä
fcde91114d
Merge 10.1 into 10.2
2018-01-03 20:42:09 +02:00
Marko Mäkelä
1e89c86dd7
Merge 10.0 into 10.1
2018-01-03 20:41:34 +02:00
Marko Mäkelä
8ac1982fcc
Merge 5.5 into 10.0
2018-01-03 20:40:41 +02:00
Marko Mäkelä
84c9c8b2e9
Silence some -Wimplicit-fallthrough by proper spelling
2018-01-03 15:01:17 +02:00
Monty
fbab79c9b8
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
...
Conflicts:
cmake/make_dist.cmake.in
mysql-test/r/func_json.result
mysql-test/r/ps.result
mysql-test/t/func_json.test
mysql-test/t/ps.test
sql/item_cmpfunc.h
2018-01-01 19:39:59 +02:00
Monty
322c637c1c
Fixed compiler warnings about possible uninitialized variables
2018-01-01 14:10:22 +02:00
Marko Mäkelä
866ccc8890
Merge bb-10.2-ext into 10.3
2017-12-14 11:34:30 +02:00
Marko Mäkelä
1b5f0cbd46
Merge 10.2 into bb-10.2-ext
2017-12-14 09:53:19 +02:00
Marko Mäkelä
ece9c54e10
Merge 10.1 into 10.2
2017-12-14 08:40:01 +02:00
Marko Mäkelä
ce07d09fd3
Merge 10.0 into 10.1
2017-12-12 19:28:26 +02:00
Marko Mäkelä
34841d2305
Merge bb-10.2-ext into 10.3
2017-12-12 09:57:17 +02:00
Sergey Vojtovich
927dd9f355
Fixed LF_BACKOFF calls
2017-12-08 21:35:29 +04:00
Marko Mäkelä
a48aa0cd56
Merge bb-10.2-ext into 10.3
2017-11-10 16:12:45 +02:00
Marko Mäkelä
c0e10f375a
Fix a -Wimplicit-fallthrough warning
2017-11-10 09:07:45 +02:00
Monty
c127a1ba14
Reduce memory used by maria_open
...
- Allocate only enough memory that we need for key status
- Saves ~100K temp usage on maria_open
2017-11-02 20:37:26 +02:00
Alexander Barkov
835cbbcc7b
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
...
TODO: enable MDEV-13049 optimization for 10.3
2017-10-30 20:47:39 +04:00
Alexander Barkov
003cb2f424
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
2017-10-30 16:42:46 +04:00
Sergei Golubchik
e0a1c745ec
Merge branch '10.1' into 10.2
2017-10-24 14:53:18 +02:00
Sergei Golubchik
9d2e2d7533
Merge branch '10.0' into 10.1
2017-10-22 13:03:41 +02:00
Michael Widenius
98cc7a8eef
Fixed compiler warnings
2017-10-18 17:10:49 +03:00
Sergei Golubchik
da4503e956
Merge branch '5.5' into 10.0
2017-10-18 15:14:39 +02:00
Sergei Golubchik
d76f5774fe
MDEV-13459 Warnings, when compiling with gcc-7.x
...
mostly caused by -Wimplicit-fallthrough
2017-10-17 07:37:39 +02:00
Oleksandr Byelkin
bea99275de
MDEV-13595: mariadb-10.2.8/storage/maria/ma_loghandler.c:2730]: (style) Array index 'chunk_offset' is used before limits check.
...
In fact just a cosmetic fix, code was safe because translog_get_first_chunk_offset return offsets inside the page.
2017-10-05 15:07:21 +02:00
Marko Mäkelä
2c1067166d
Merge bb-10.2-ext into 10.3
2017-10-04 08:24:06 +03:00
Alexander Barkov
8ae8cd6348
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
2017-10-02 22:35:13 +04:00
Marko Mäkelä
3c4cff3357
Merge 10.1 into 10.2
2017-10-02 11:16:53 +03:00
Vladislav Vaintroub
7354dc6773
MDEV-13384 - misc Windows warnings fixed
2017-09-28 17:20:46 +00:00
Vladislav Vaintroub
eba44874ca
MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.
...
- Fix win64 pointer truncation warnings
(usually coming from misusing 0x%lx and long cast in DBUG)
- Also fix printf-format warnings
Make the above mentioned warnings fatal.
- fix pthread_join on Windows to set return value.
2017-09-28 17:20:46 +00:00
Alexander Barkov
67eb1252ac
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
2017-09-28 18:56:15 +04:00
Alexander Barkov
7131a0a803
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
2017-09-28 18:42:14 +04:00
Monty
5a0cd753be
Added missing test if table is transactional or not in Aria
...
- The line was accidently removed by dd8474b1dc
- The effect of the missing test was just a few extra malloc when creating
internal temporary tables. Nothing critical, but better got get fixed.
2017-09-28 11:59:28 +03:00
Monty
06f7a7620f
Fixed compiler warning
2017-09-27 22:19:39 +03:00
Sergei Golubchik
7dc1815d5c
cleanup: reduce code duplication
...
remove copy-pasted code, fix meaningless comparison.
followup for ea2162b6aa
2017-09-27 10:18:06 +02:00
Marko Mäkelä
4a32e2395e
Merge bb-10.2-ext into 10.3
2017-09-25 22:05:56 +03:00
Marko Mäkelä
86c3ba65aa
Merge 10.2 into bb-10.2-ext
2017-09-25 21:45:44 +03:00
Marko Mäkelä
7dcb8816a1
Merge 10.1 into 10.2
2017-09-25 13:46:54 +03:00
Varun Gupta
ea2162b6aa
MDEV-11846: ERROR 1114 (HY000) table full when performing GROUP BY
...
The problem is there is an overflow for the key_file_length.
Added the maximum limit for the key_file_length
2017-09-24 23:33:44 +05:30
Sergei Golubchik
1320ad5b92
Merge branch '10.2' into bb-10.2-ext
2017-09-23 20:22:30 +02:00
Monty
0a44ae6528
Fix that FLUSH TABLES FOR EXPORT also works for Aria tables.
...
- Added missing test case for MyISAM
2017-09-21 16:34:48 +03:00
Marko Mäkelä
4e1fa7f63d
Merge bb-10.2-ext into 10.3
2017-09-01 11:33:45 +03:00
Marko Mäkelä
6749d39a95
Merge 10.2 into bb-10.2-ext
2017-09-01 08:47:55 +03:00
Marko Mäkelä
4386ee8ccc
Add ATTRIBUTE_NORETURN and ATTRIBUTE_COLD
...
ATTRIBUTE_NORETURN is supported on all platforms (MSVS and GCC-like).
It declares that a function will not return; instead, the thread or
the whole process will terminate.
ATTRIBUTE_COLD is supported starting with GCC 4.3. It declares that
a function is supposed to be executed rarely. Rarely used error-handling
functions and functions that emit messages to the error log should be
tagged such.
2017-08-31 09:30:55 +03:00
Sergei Golubchik
bb8e99fdc3
Merge branch 'bb-10.2-ext' into 10.3
2017-08-26 00:34:43 +02:00
Sergei Golubchik
27412877db
Merge branch '10.2' into bb-10.2-ext
2017-08-25 10:25:48 +02:00
Michael Widenius
8e722064f7
Remove dumping of some not needed core's when running test suite
...
Before this patch running full mtr generated some 70 cores (at least
on systemd). Now no cores should be generated.
- Changed DBUG_ABORT()'s used by mysql-test-run to DBUG_SUICIDE()
- Changed DBUG_ABORT() used to crash server with core to DBUG_ASSERT(0)
- DBUG_ASSERT now flushes DBUG files
2017-08-24 01:05:52 +02:00
Monty
536215e32f
Added DBUG_ASSERT_AS_PRINTF compile flag
...
If compiling a non DBUG binary with
-DDBUG_ASSERT_AS_PRINTF asserts will be
changed to printf + stack trace (of stack
trace are enabled).
- Changed #ifndef DBUG_OFF to
#ifdef DBUG_ASSERT_EXISTS
for those DBUG_OFF that was just used to enable
assert
- Assert checking that could greatly impact
performance where changed to DBUG_ASSERT_SLOW which
is not affected by DBUG_ASSERT_AS_PRINTF
- Added one extra option to my_print_stacktrace() to
get more silent in case of stack trace printing as
part of assert.
2017-08-24 01:05:50 +02:00