Marko Mäkelä
18934fb583
Merge 10.1 into 10.2
2018-05-29 16:52:12 +03:00
Monty
5a16fe0e6f
Fixed compiler warnings
...
When merging this with 10.2 and later, one can just use the 10.2 or later code
2018-05-26 12:49:25 +03:00
Marko Mäkelä
2a00bdeb4a
Remove unused function FixNull()
2018-04-24 12:06:28 +03:00
Vicențiu Ciorbaru
45e6d0aebf
Merge branch '10.1' into 10.2
2018-04-10 17:43:18 +03:00
Monty
2f2e7f8c9d
Fixed compiler warnings in sphinx
2018-03-26 17:56:09 +03:00
Monty
7ed0156384
Removed compiler warnings
2018-02-10 14:32:24 +02: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
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
Vladislav Vaintroub
7354dc6773
MDEV-13384 - misc Windows warnings fixed
2017-09-28 17:20:46 +00:00
Marko Mäkelä
70505dd45b
Merge 10.1 into 10.2
2017-05-22 09:46:51 +03:00
Marko Mäkelä
13a350ac29
Merge 10.0 into 10.1
2017-05-19 12:29:37 +03:00
Sergei Golubchik
314f32c8c2
MDEV-5477 sphinxSE GROUP BY on multiple attributes
...
Translate "multi:" to SPH_GROUPBY_MULTIPLE.
SPH_GROUPBY_ATTRPAIR is still not supported.
2017-05-16 12:42:53 +02:00
Sergei Golubchik
71b4503242
MDEV-9998 Fix issues caught by Clang's -Wpointer-bool-conversion warning
...
remove useless checks
and a couple of others
2017-05-15 22:23:10 +02:00
Sergei Golubchik
ca503e830b
mtr: make sphinx skipping a bit less verbose
2017-02-13 18:12:15 +01:00
Marko Mäkelä
f27ca6f667
Merge 10.1 into 10.2
2017-01-10 14:39:28 +02:00
Marko Mäkelä
5044dae239
Merge 10.0 into 10.1
2017-01-10 14:30:11 +02:00
Elena Stepanova
b2b6cf492e
MDEV-10988 Sphinx test suite refuses to run silently
...
Add diagnostics output if any Sphinx components aren't found
2017-01-06 00:07:43 +02:00
Sergei Golubchik
4a5d25c338
Merge branch '10.1' into 10.2
2016-12-29 13:23:18 +01:00
Elena Stepanova
72c9de13fd
MDEV-10986 sphinx.union-5539 and sphinx.sphinx fail in buildbot and outside
...
Do not include the suite into the default list until the tests are stable
2016-11-07 01:52:07 +03:00
Elena Stepanova
ee0094d2fd
MDEV-10985, MDEV-10986 - sphinx tests have not been maintained
2016-11-04 13:33:28 +03:00
Sergei Golubchik
a5679af1b1
Merge branch '10.0' into 10.1
2016-02-23 21:35:05 +01:00
Oliver Giles
d9c640aa8b
SphinxSE: add support for json filtering
...
The filter command did not accept characters . [ ] which are valid
in an attribute name for a sphinx query with json filtering.
+ test case added
2016-02-22 12:50:39 +01:00
Sergei Golubchik
271fed4106
Merge branch '5.5' into 10.0
2016-02-15 22:50:59 +01:00
Sergei Golubchik
5f078cc8ff
compilation errors on sparc sun studio 10
...
1. unused static inline functions are only removed at -xO4,
otherwise test binaries will depend on various mysys
symbols that they don't use. Link test with libmysys.
2. Sphinx - don't instantiate (explicitly) templates before
they're defined. Or, rather, don't instantiate them explicitly at
all.
3. GIS - don't use anonymous unions and structs.
2016-02-15 12:51:35 +01:00
Monty
1bae0d9e56
Stage 2 of MDEV-6152:
...
- Added mem_root to all calls to new Item
- Added private method operator new(size_t size) to Item to ensure that
we always use a mem_root when creating an item.
This saves use once call to current_thd per Item creation
2015-08-21 10:40:51 +04:00
Sergey Vojtovich
31e365efae
MDEV-8010 - Avoid sql_alloc() in Items (Patch #1 )
...
Added mandatory thd parameter to Item (and all derivative classes) constructor.
Added thd parameter to all routines that may create items.
Also removed "current_thd" from Item::Item. This reduced number of
pthread_getspecific() calls from 290 to 177 per OLTP RO transaction.
2015-08-21 10:40:39 +04:00
Sergei Golubchik
658992699b
Merge tag 'mariadb-10.0.20' into 10.1
2015-06-27 20:35:26 +02:00
Sergei Golubchik
810cf362ea
Merge branch '5.5' into 10.0
2015-06-11 20:20:35 +02:00
Sergei Golubchik
4b21cd21fe
Merge branch '10.0' into merge-wip
2015-01-31 21:48:47 +01:00
Michael Widenius
f0be022cf0
MDEV-5539 Empty results in UNION with Sphinx engine
...
The bug was fixed by Serg earlier by including Sphinx 2.2.6, but he forgot to update the test case.
2014-12-30 17:10:54 +02:00
Sergei Golubchik
0d30423900
cleanup: reuse MY_CHECK_AND_SET_COMPILER_FLAG in sphinx/CMakeLists.txt
2014-12-04 10:41:51 +01:00
Sergei Golubchik
853077ad7e
Merge branch '10.0' into bb-10.1-merge
...
Conflicts:
.bzrignore
VERSION
cmake/plugin.cmake
debian/dist/Debian/control
debian/dist/Ubuntu/control
mysql-test/r/join_outer.result
mysql-test/r/join_outer_jcl6.result
mysql-test/r/null.result
mysql-test/r/old-mode.result
mysql-test/r/union.result
mysql-test/t/join_outer.test
mysql-test/t/null.test
mysql-test/t/old-mode.test
mysql-test/t/union.test
packaging/rpm-oel/mysql.spec.in
scripts/mysql_config.sh
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_ndbcluster_cond.cc
sql/item_cmpfunc.h
sql/lock.cc
sql/sql_select.cc
sql/sql_show.cc
sql/sql_update.cc
sql/sql_yacc.yy
storage/innobase/buf/buf0flu.cc
storage/innobase/fil/fil0fil.cc
storage/innobase/include/srv0srv.h
storage/innobase/lock/lock0lock.cc
storage/tokudb/CMakeLists.txt
storage/xtradb/buf/buf0flu.cc
storage/xtradb/fil/fil0fil.cc
storage/xtradb/include/srv0srv.h
storage/xtradb/lock/lock0lock.cc
support-files/mysql.spec.sh
2014-12-02 22:25:16 +01:00
Sergei Golubchik
5813246589
sphinx 2.2.6
2014-11-20 16:53:12 +01:00
Sergei Golubchik
f62c12b405
Merge 10.0.14 into 10.1
2014-10-15 12:59:13 +02:00
Sergei Golubchik
2fae1b576d
prefer to use new flag name when possible
2014-10-10 22:27:40 +02:00
Sergei Golubchik
1b75bed00f
5.5.40+ merge
2014-10-09 10:30:11 +02:00
Sergei Golubchik
aa36d9e742
MDEV-5120 Test suite test maria-no-logging fails
...
stat structure (from <sys/stat.h>) is conditionally defined
to have different layout and size depending on the defined macros.
The correct macro is defined in my_config.h, which means it MUST be
included first (or, at least before <features.h> - so, practically,
before including any system headers).
2014-10-02 11:57:40 +02:00
Sergei Golubchik
1e3e81a6c9
sphinx 2.1.9
2014-09-13 00:30:46 +02:00
Alexander Barkov
fbaaf3688d
Moving Item::str_value from public to protected.
2014-09-03 01:56:21 +04:00
Sergei Golubchik
94c97e5b68
update plugins' maturity levels:
...
old plugins get STABLE
newer plugins get GAMMA
those that had bugs recently get BETA
2014-03-19 09:56:46 +01:00
Sergei Golubchik
0dc23679c8
10.0-base merge
2014-02-26 15:28:07 +01:00
Sergei Golubchik
0b9a0a3517
5.5 merge
2014-02-25 16:04:35 +01:00
Sergei Golubchik
64f96de766
fix SphinxSE to not leave Sphinx_error status variable uninitialized
2014-02-14 15:16:23 +01:00
Sergei Golubchik
bbfd113127
don't link with libmysys twice (it's implied here)
2014-02-04 19:08:50 +01:00
Sergei Golubchik
65121806da
upgrade sphinx to 2.1.5
2014-02-01 14:08:34 +01:00
Sergei Golubchik
ce2fabe442
move oqgraph and sphinx suites into storage/*/mysql-test/
2013-12-16 13:32:03 +01:00
unknown
57a267a8c0
Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.
...
The merge is still missing a few hunks related to temporary tables and
InnoDB log file size. The associated code did not seem to exist in
10.0, so the merge of that needs more work. Until this is fixed, there
are a number of test failures as a result.
2013-11-01 12:00:11 +01:00
unknown
cb86ce60b9
Merge MDEV-4506: Parallel replication into 10.0-base.
2013-11-01 09:17:06 +01:00
