Commit graph

1138 commits

Author SHA1 Message Date
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
b1966435c2 MDEV-5580 /etc/init.d/mysql exits too early
Wait until the server starts accepting connections, not until the pid file appears
2014-02-17 11:10:30 +01:00
Sergei Golubchik
cb324d91ad MDEV-5579 rpm postun scriptlet leaks exit code to rpm 2014-02-17 11:10:03 +01:00
Sergei Golubchik
84651126c0 MySQL-5.5.36 merge
(without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
2014-02-17 11:00:51 +01:00
Michael Widenius
313f18be5a Fixed errors and warnings found by buildbot
mysql-test/r/lowercase_table2.result:
  Updated result
  (The change happend because we don't try to open the table anymore as part of create table)
mysql-test/suite/rpl/r/create_or_replace_mix.result:
  Fixed result file
mysql-test/suite/rpl/r/create_or_replace_row.result:
  Fixed result file
mysql-test/suite/rpl/r/create_or_replace_statement.result:
  Fixed result file
mysql-test/suite/rpl/t/create_or_replace.inc:
  Drop open temporary table
mysys/my_delete.c:
  Added missing newline
plugin/metadata_lock_info/mysql-test/metadata_lock_info/r/user_lock.result:
  Fixed result
  (Lock names was before off by one. Was corrected by my previous patch)
sql/sql_select.cc:
  Fixed compiler warnings by adding missing casts
storage/connect/ha_connect.cc:
  Fixed compiler warnings
storage/innobase/os/os0file.cc:
  Fixed compiler warnings
storage/xtradb/btr/btr0btr.cc:
  Fixed compiler warnings
storage/xtradb/handler/ha_innodb.cc:
  removed not used function
strings/ctype-uca.c:
  Fixed compiler warnings
support-files/compiler_warnings.supp:
  Added suppression for warnings that are wrong or are not serious andthat we don't plan to fix.
2014-02-06 16:14:09 +02:00
Sergei Golubchik
72c20282db 10.0-base merge 2014-02-03 15:22:39 +01:00
Sergei Golubchik
59d9d08e2b 5.5 merge 2014-02-01 00:54:03 +01:00
Sergei Golubchik
37d240ecf9 MySQL-5.5.35 merge 2014-01-22 15:29:36 +01:00
Murthy Narkedimilli
c92223e198 Updated/added copyright headers 2014-01-06 10:52:35 +05:30
Sergei Golubchik
d28d3ba40d 10.0-base merge 2013-12-16 13:02:21 +01:00
Sergei Golubchik
6bf10fac44 5.5 merge 2013-12-15 15:57:26 +01:00
Sergei Golubchik
c6d30805db 5.5 merge 2013-11-23 00:50:54 +01:00
Sergei Golubchik
5e812ee03b MDEV-5303 rpm post-inst scriptlet creates mysql user with a valid shell
create mysql user with /sbin/nologin shell
2013-11-20 12:18:46 +01:00
Michael Widenius
bbda717e93 Fixed compiler errors and warnings
extra/jemalloc/src/ctl.c:
  Fixed compiler warning
include/mysql/service_logger.h:
  Fixed compile failure with clang compiler
storage/maria/ma_check.c:
  Fixed compiler warning
support-files/compiler_warnings.supp:
  Suppressed warnings in jemalloc
tests/bug25714.c:
  Fixed compiler warning
2013-12-02 22:22:43 +02:00
Sergey Vojtovich
160236f880 MDEV-5182 - build of 10.0.4/r3863 fails @ 'cmake' with
-DINSTALL_SYSCONFDIR/-DDEFAULT_SYSCONFDIR specified

The reason for a bug is in support-files/CMakeLists.txt that tries to
install files in INSTALL_SYSCONF2DIR, without checking whether this
variable is actually defined. 

Normally INSTALL_SYSCONF2DIR is always defined if INSTALL_SYSCONFDIR is
defined, and support-files/CMakeLists.txt assumes that. But when one
specifies INSTALL_SYSCONFDIR manually on the command line, this
assumption might be broken.
2013-11-18 15:48:01 +04:00
Sergei Golubchik
fa3f8a18b2 mysql-5.5.34 merge
(some patches reverted, test case added)
2013-11-19 13:16:25 +01:00
Sergei Golubchik
4157185f24 10.0-base merge 2013-11-13 23:03:48 +01:00
Sergei Golubchik
bdd883ed9a 5.5. merge 2013-11-13 14:07:58 +01:00
Sergei Golubchik
6971eaf3f0 MDEV-5030 RPM installation not running mysql_install_db if datadir exists
before running mysql_install_db check for the existence
of $datadir/mysql, not simply $datadir ($datadir might be mounted on
a separate device - exists, but empty)
2013-11-11 09:31:05 +01:00
Balasubramanian Kandasamy
fc98c60f51 Merge 5.1 => 5.5 2013-10-30 04:12:24 +01:00
Balasubramanian Kandasamy
d73f2a8224 Removed non gpl file docs/mysql.info from community packages 2013-10-30 04:07:07 +01:00
Sergey Petrunya
1e36cbfa39 MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE
- Merge with 10.0-base
2013-10-15 11:51:41 +04:00
Sergey Petrunya
e5d13c1567 Merge 10.0-base -> 10.0 2013-10-16 13:38:42 +04:00
Sergei Golubchik
ed2c573451 update /etc/my.cnf.d/server.cnf to say 10.0, not 5.5 2013-09-25 19:41:28 +02:00
Sergei Golubchik
4ec2e9d7ed 5.5 merge and fixes for compiler/test errors 2013-09-18 13:07:31 +02:00
Sergei Golubchik
62643f81e6 merge with 5.5-tokudb tree. In particular:
* add TokuDB, together with the ft-index library
* cmake support, auto-detecting whether tokudb can be built
* fix packaging - tokudb-engine.rpm, deb
* remove PBXT
* add jemalloc
* the server is built with jemalloc by default even if TokuDB is not built
* documentation files in RPM are installed in the correct location
* support for optional deb packages (tokudb has specific build requirements)
* move plugins from mariadb-server deb to appropriate debs (server/test/libmariadbclient)
* correct mariadb-test.deb to be not architecture-independent
* fix out-of-tree builds to never modify in-tree files
* new handler::prepare_index_scan() method
2013-09-10 23:02:25 +02:00
Sergei Golubchik
265bbf5fe1 introduce sysconf2dir, install tokudb.conf there, both in rpm and deb 2013-09-10 22:59:18 +02:00
Balasubramanian Kandasamy
07ffbdc2c9 Reverted the changes to spec file to ignore mysqld_safe.pid file, updated the logic to get the correct count of PID files 2013-09-09 20:07:12 +02:00
Balasubramanian Kandasamy
543b6e0224 Reverted the changes to spec file, updated the logic to get the correct count of PID files 2013-09-09 19:49:44 +02:00
Hery Ramilison
199a98ee28 Committing patch from venkata.sidagam@oracle.com for Bug#16776528 2013-09-09 18:58:08 +02:00
Sergei Golubchik
b838d081ad mysql-5.5.33 merge 2013-09-06 22:31:30 +02:00
Hery Ramilison
0daae54fb5 Fixing sles11 build that /usr/lib/mysql/plugin is not owned by a package 2013-09-03 18:37:46 +02:00
Balasubramanian Kandasamy
9e49de009c Fix to ignore mysqld_safe.pid 2013-08-30 17:14:46 +02:00
Balasubramanian Kandasamy
bb82aecef9 Fix to ignore mysqld_safe.pid 2013-08-30 15:02:16 +02:00
Sergei Golubchik
6755944d08 remove PBXT 2013-08-30 11:25:49 +02:00
Balasubramanian Kandasamy
1f6434ba3d Corrected the PID_FILE_PATT manipulation 2013-08-30 06:33:02 +02:00
Balasubramanian Kandasamy
095b6645b0 Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe script 2013-08-29 14:42:55 +02:00
Balasubramanian Kandasamy
e2c77ad949 Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe script 2013-08-29 14:33:28 +02:00
Sergey Petrunya
662bfed027 [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring
- Merge with current 10.0-base
2013-08-24 00:46:49 +04:00
Balasubramanian Kandasamy
6613734b1a Corrected Date in the changelog 2013-08-22 16:51:30 +02:00
Balasubramanian Kandasamy
9d9e54d380 Removed bugnumber from the changelog and updated description 2013-08-22 14:58:13 +02:00
Balasubramanian Kandasamy
fcc0011438 Reverted Release version 2013-08-20 12:21:35 +02:00
Balasubramanian Kandasamy
1e904e36e5 dummy commit 2013-08-16 17:48:54 +02:00
Balasubramanian Kandasamy
f1e23d73d5 Added fix Provides for Bug#17211588 2013-08-16 16:41:20 +02:00
Sergei Golubchik
97e640b9ae 5.5 merge 2013-07-17 21:24:29 +02:00
Sergei Golubchik
005c7e5421 mysql-5.5.32 merge 2013-07-16 19:09:54 +02:00
Balasubramanian Kandasamy
66aad1a94d Updated spec file for Bug#17080138 2013-07-10 19:14:41 +02:00
Sergey Petrunya
ef47cc1f09 [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring
- Merge with 10.0-base
2013-06-27 18:28:14 +04:00
Balasubramanian Kandasamy
1cfa4eb045 Updated copyright year in the spec file 2013-06-27 10:08:30 +02:00