Sergei Golubchik
c9801135c1
Merge branch '10.1' into 10.2
2017-07-08 09:56:28 +02:00
Sergei Golubchik
9e11e055ce
Merge branch '10.0' into 10.1
2017-07-07 11:30:03 +02:00
Sergei Golubchik
89dc445a55
Merge branch '5.5' into 10.0
2017-07-06 23:47:33 +02:00
Monty
cdd4043117
Cleanups:
...
- Removed some QQ markers
- Removed some rows not compatible with valgrind 3.9.0
- Made mysql_install_db.sh more silent by default. --verbose now gives more information
- Added assert that auto-increment doesn't generate 0 (safety)
- Removed thd->set_time() in some places as it's set in init_for_queries()
- Fixed some --big tests in tokudb
- Fixed a bug in mysql_client_test.cc where sql_mode was not properly reset
2016-04-05 18:00:04 +03:00
Sergei Golubchik
f67a2211ec
Merge branch '10.1' into 10.2
2016-03-23 22:36:46 +01:00
Sergei Golubchik
3b0c7ac1f9
Merge branch '10.0' into 10.1
2016-03-21 13:02:53 +01:00
Sergei Golubchik
22ebf3cb45
MDEV-9527 build FAILs with GCC 5.1 with release supported "-std=c+11"
...
10.0 part of the fix
2016-03-21 11:55:03 +01:00
Sergey Vojtovich
c1d1c59888
MDEV-9488 - Table cache cleanups
...
Remove tdc_acquire_share() helpers: they don't actually make things simpler.
2016-02-26 18:35:14 +04:00
Kentoku SHIBA
06913d0162
Update Mroonga to the latest version on 2015-07-02T04:12:21+0900
2015-07-02 04:12:21 +09:00
Sergei Golubchik
5091a4ba75
Merge tag 'mariadb-10.0.19' into 10.1
2015-06-01 15:51:25 +02:00
Kentoku SHIBA
a0fdb258a4
Update Mroonga to the latest version on 2015-04-30T04:44:30+0900
2015-04-30 04:44:30 +09:00
Sergei Golubchik
2db62f686e
Merge branch '10.0' into 10.1
2015-03-07 13:21:02 +01:00
Sergei Golubchik
73033e5e1a
fix mroonga to compile w/o performance schema
2015-02-24 15:54:59 +01:00
Kentoku SHIBA
f5dabd7aca
Update Mroonga to the latest version on 2015-02-17T13:34:27+0900
2015-02-17 13:34:27 +09: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
Kentoku SHIBA
7f3d555087
Update Mroonga to the latest version on 2014-10-21T04:51:38+0900
2014-10-21 04:51:38 +09:00
Sergei Golubchik
1b75bed00f
5.5.40+ merge
2014-10-09 10:30:11 +02:00
Kentoku SHIBA
0cc855cdc8
Update Mroonga to the latest version on 2014-09-21T00:33:44+0900
2014-09-21 00:33:45 +09:00
