Commit graph

2172 commits

Author SHA1 Message Date
Sergei Golubchik
d7e7862364 Merge branch '5.5' into 10.0 2015-02-18 15:16:27 +01:00
Sergei Golubchik
5dce6aa1fe Merge remote-tracking branch 'bzr/5.5' into bb-5.5-merge 2015-02-12 13:14:55 +01:00
Sergei Golubchik
8e80f91fa3 Merge remote-tracking branch 'mysql/5.5' into bb-5.5-merge @ mysql-5.5.42 2015-02-11 23:50:40 +01:00
Sergei Golubchik
a34fd50ce1 MDEV-7478 log-basename unpredictable behavior in standalone mode
* fix /etc/init.d/mysql to use log-basename for pid-filename
* fix mysqld_safe not to force logging-to-file when log-basename is specified
2015-02-09 20:53:36 +01:00
Sergei Golubchik
d9c01e4b4a 5.5 merge 2015-01-21 12:03:02 +01:00
Nirbhay Choubey
919825a3ad MDEV-7368 : SLES: Failed to start mysql.service: Unit
mysql.service failed to load

Added 'systemctl daemon-reload' command in postin and
postun rpm scripts.
2015-01-14 18:26:29 -05:00
Nirbhay Choubey
d9d994089f MDEV-7368 : SLES: Failed to start mysql.service: Unit
mysql.service failed to load

Added 'systemctl daemon-reload' command in postin and
postun rpm scripts.
2015-01-14 18:24:23 -05:00
Sergei Golubchik
a978bdda1e mysql-5.5.41 merge 2014-12-19 11:35:44 +01:00
Tor Didriksen
dd4f852953 Bug#20009543 SUPPORT-FILES/BUILD-TAGS TRANSITION TO GIT
Use 'git ls-files' to find source files for etags.
2014-11-12 11:11:10 +01:00
Balasubramanian Kandasamy
b821be7df5 Rpm 4.9 and newer is more strict regarding weekday in %changelog 2014-10-23 06:56:47 +02:00
Balasubramanian Kandasamy
5057f47ed9 Rpm 4.9 and newer is more strict regarding weekday in %changelog 2014-10-23 06:56:47 +02:00
Balasubramanian Kandasamy
54fd994a5d Fix changelog entries build failure 2014-10-21 16:19:47 +02:00
Balasubramanian Kandasamy
347234db90 Fix changelog entries build failure 2014-10-21 16:19:47 +02:00
Sergei Golubchik
1b75bed00f 5.5.40+ merge 2014-10-09 10:30:11 +02:00
Sergei Golubchik
dbda20caff remove mariadb.pc file again, it cannot be added in a GA version 2014-10-08 09:35:00 +02:00
Sergei Golubchik
e73e1e7c7a packaging issues:
* skip debian 44_scripts__mysql_config__libs.dpatch it does not apply anymore
  (and anyway it would not work for a static library)
* fix the path for install(mariadb.pc)
2014-10-07 16:21:53 +02:00
Sergei Golubchik
1ddfce4840 mysql-5.5.40 2014-10-06 19:53:55 +02:00
Sergei Golubchik
604b653394 MDEV-5749 Please add a .pc file to MariaDB for easy use via pkg-config
1. move cflags/libs cleanup from mysql_config.sh (runtime)
   to for_client.cmake (build time). Include/library paths are
   still calculated at runtime (they depend on the location of mysql_config)

2. Use cleaned-up cflags/libs to generate mariadb.pc

3. remove obsolete @expansions@ from mysql_config (for variables that are
   never set in cmake files)
2014-10-02 16:58:26 +02:00
Balasubramanian Kandasamy
c2fc7d39b2 Add my.cnf.d to regular rpm for EL7 build 2014-08-20 09:46:38 +02:00
Balasubramanian Kandasamy
010ea6ccc6 Add my.cnf.d to regular rpm for EL7 build 2014-08-20 09:46:38 +02:00
Balasubramanian Kandasamy
94f265ba2c Corrected typo 2014-08-12 19:37:49 +02:00
Balasubramanian Kandasamy
9e111f6a2a Corrected typo 2014-08-12 19:37:49 +02:00
Balasubramanian Kandasamy
e8afbf1e38 Experimental testing 2014-08-12 18:55:05 +02:00
Balasubramanian Kandasamy
7b25051e88 Experimental testing 2014-08-12 18:55:05 +02:00
Balasubramanian Kandasamy
c744cc960f Experimental testing for patch 2014-08-12 18:26:46 +02:00
Balasubramanian Kandasamy
09f52fc063 Experimental testing for patch 2014-08-12 18:26:46 +02:00
Balasubramanian Kandasamy
414c596fee Added my.cnf.d directory, removed mysql-5.5-libmysqlclient-symbols.patch 2014-08-12 16:53:31 +02:00
Balasubramanian Kandasamy
a1538ec5f0 Added my.cnf.d directory, removed mysql-5.5-libmysqlclient-symbols.patch 2014-08-12 16:53:31 +02:00
Balasubramanian Kandasamy
34bc0829c3 Add patch mysql-5.5-libmysqlclient-symbols.patch for el7 2014-08-12 14:32:16 +02:00
Balasubramanian Kandasamy
dab1d7d221 Add patch mysql-5.5-libmysqlclient-symbols.patch for el7 2014-08-12 14:32:16 +02:00
Balasubramanian Kandasamy
77a5517c93 - Merge from mysql-5.5.39-ol7-release branch
- Reverted version variable
2014-08-06 09:56:37 +02:00
Balasubramanian Kandasamy
b9bc2bd434 - Merge from mysql-5.5.39-ol7-release branch
- Reverted version variable
2014-08-06 09:56:37 +02:00
Balasubramanian Kandasamy
0bd28ebe2d Updated for el7 regular rpms 2014-08-04 15:56:19 +02:00
Balasubramanian Kandasamy
1a1e904004 Updated for el7 regular rpms 2014-08-04 15:56:19 +02:00
Sergei Golubchik
1c6ad62a26 mysql-5.5.39 merge
~40% bugfixed(*) applied
~40$ bugfixed reverted (incorrect or we're not buggy)
~20% bugfixed applied, despite us being not buggy
(*) only changes in the server code, e.g. not cmakefiles
2014-08-02 21:26:16 +02:00
Sergei Golubchik
1987819281 MDEV-6428 [PATCH] MariaDB start script doesn't realize failure of MariaDB startup
abort the wait loop if mysqld_safe is not running
2014-07-26 23:08:38 +02:00
Balasubramanian Kandasamy
94b31b57ac Bug#19172145 - Remove perl(GD) and dtrace dependencies and bench fix 2014-07-09 12:39:19 +02:00
Balasubramanian Kandasamy
354e923cfe Bug#19172145 - Remove perl(GD) and dtrace dependencies and bench fix 2014-07-09 12:39:19 +02:00
Michael Widenius
258ecf5538 Added Innobase .ic and errmsg-utf8.txt to tagged files
Fixed compiler warning

storage/connect/tabdos.cpp:
  Fixed compiler warning
support-files/build-tags:
  Added Innobase .ic and errmsg-utf8.txt to tagged files
  Speed up script
2014-08-14 15:36:48 +03:00
Sergei Golubchik
6fb17a0601 5.5.39 merge 2014-08-07 18:06:56 +02:00
Bjorn Munch
d3625112b1 Unconditionally disable dtrace for rpm, barfs on Oracle dtrace 2014-07-02 09:38:43 +02:00
Bjorn Munch
b631743a9f Unconditionally disable dtrace for rpm, barfs on Oracle dtrace 2014-07-02 09:38:43 +02:00
Terje Rosten
410b1dd86d Bug#16395459 TEST AND RESULT FILES WITH EXECUTE BIT
Bug#16415173 CRLF INSTEAD OF LF IN SQL-BENCH SCRIPTS
      
Correct perms and converts from Windows style to UNIX style line endings on some files.
Fix perms on installed ini files.

(MySQL 5.5 version)
2014-06-25 12:35:50 +02:00
Terje Rosten
5c4937c101 Bug#16395459 TEST AND RESULT FILES WITH EXECUTE BIT
Bug#16415173 CRLF INSTEAD OF LF IN SQL-BENCH SCRIPTS
      
Correct perms and converts from Windows style to UNIX style line endings on some files.
Fix perms on installed ini files.

(MySQL 5.5 version)
2014-06-25 12:35:50 +02:00
Sergei Golubchik
e27c338634 5.5.38 merge 2014-06-06 00:07:27 +02:00
Sergei Golubchik
759fa19690 don't install ndb related .ini files, remove mysql_fix_privilege_tables.1 and mysqlman.1 2014-06-01 11:23:20 +02:00
Sergei Golubchik
d3e2e1243b 5.5 merge 2014-05-09 12:35:11 +02:00
Sergei Golubchik
10740939eb 5.5 merge 2014-03-26 22:25:38 +01:00
Michael Widenius
ded448d1d0 MDEV-5905: Creating tmp. memory table kills the server
The reason was that a couple of variables that hold number of rows that was used to calculate buffers was uint and caused an overflow.

Fixed by changing variables that could hold number of rows from uint to ulong and also added a cast for this test.

include/heap.h:
  Reorder to get better alignment. Changed variables that could hold number of rows from uint to ulong
mysql-test/suite/heap/heap.result:
  Added test case
mysql-test/suite/heap/heap.test:
  Added test case
mysql-test/suite/plugins/t/server_audit.test:
  Added sleep as we want to have disconnect logged before we try a new connect
storage/heap/ha_heap.cc:
  Changed variables that could hold number of rows from uint to ulong
  Limit number of rows to 4G  (as most of the variables that holds rows are ulong anyway)
  reset records_changed when key_stat_version is changed to not cause increments for every row changed
storage/heap/ha_heap.h:
  changed records_changed to ulong as this can get big
storage/heap/hp_create.c:
  Changed variables that could hold number of rows from uint to ulong
  Added cast (fixed the original bug)
storage/heap/hp_delete.c:
  Changed variables that could hold number of rows from uint to ulong
storage/heap/hp_open.c:
  Removed not needed cast
storage/heap/hp_write.c:
  Changed variables that could hold number of rows from uint to ulong
support-files/compiler_warnings.supp:
  Removed extra : from supression
2014-03-26 21:58:27 +02:00
Sergei Golubchik
01b1eef23e MDEV-5831 Upgrade from MariaDB 5.5.36 via yum fails
Allow "rpm -q --whatprovides mysql-server" to return more than one row.
(all rows should be identical though)

support-files/rpm/server-prein.sh:
  don't use "head -1" or "uniq" to avoid introducing new dependencies.
  "sed" is already used in this script.
2014-03-24 20:01:37 +01:00