Commit graph

2288 commits

Author SHA1 Message Date
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
Nirbhay Choubey
e5cea60933 Local merge of patch for MDEV-3896 from maria-5.5-galera. 2014-07-21 17:27:06 -04:00
Nirbhay Choubey
0dadd01750 MDEV-3896: More user-friendly cnf files in MariaDB-Galera rpm/deb
packages

* Added "galera" as default option group.
* Updated deb/rpm server config files to include mandatory
  and optional settings (as comments) required to configure
  Galera cluster.
2014-07-17 16:22:01 -04: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
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
Sergei Golubchik
afa4c36ca0 cmake: prefer INSTALL(PROGRAMS over INSTALL(FILES 2014-06-26 11:54:12 +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
Nirbhay Choubey
a76a6601ec bzr merge -rtag:mariadb-10.0.12 maria/10.0 2014-06-19 13:12:38 -04:00
Sergei Golubchik
f61f36b386 Merge branch '10.0' into 10.1
Conflicts:
	CMakeLists.txt
	VERSION
Modified:
	.gitignore
2014-06-13 16:10:25 +02:00
Nirbhay Choubey
c29cbac2eb bzr merge -r3985..3997 codership/5.5 2014-06-10 17:00:32 -04:00
Nirbhay Choubey
b441c510a7 bzr merge -rtag:mariadb-5.5.38 maria/5.5 2014-06-10 16:04:26 -04: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
eef1201bcc set version to 10.1.0 2014-05-25 17:17:50 +02:00
Nirbhay Choubey
81a85ad8d7 bzr merge -r3985..3991 codership/5.5 2014-05-21 15:04:13 -04:00
Nirbhay Choubey
086af8367e bzr merge -r4209 maria/10.0. 2014-05-21 11:09:55 -04:00
Sergei Golubchik
d3e2e1243b 5.5 merge 2014-05-09 12:35:11 +02:00
Nirbhay Choubey
dee153c1b8 * Removed unnecessary duplicate script files.
* Updated failing mtr tests.
2014-04-18 16:56:44 -04:00
Nirbhay Choubey
43a9e65547 MDEV#6132: yum update for MGC-10.0 fails (10.0.7 -> 10.0.10)
Fixed the incorrect sed command.
2014-04-17 14:10:22 -04:00
Jan Lindström
fa18dc3944 Merge lp:codership-mysql/5.5 -r3961..3980. 2014-04-16 13:08:29 +03:00
Jan Lindström
150e88e8c9 Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. 2014-04-16 12:13:43 +03:00
Sergei Golubchik
81e6327e49 MDEV-5068 import file from init script 2014-04-10 10:34:28 +02:00
Nirbhay Choubey
4213263101 Merging mariadb-10.0.10.
* bzr merge -rtag:mariadb-10.0.10 maria/10.0.
2014-04-08 10:36:34 -04:00
Sergei Golubchik
64b9b65eb5 MDEV-5986 MariaDB upgrade on CentOS 6 fails due to sed error
typo in the rpm server prein scriptlet
2014-04-07 20:41:28 +02:00
Sergei Golubchik
cb67dcb618 mysql-5.5.37 selective merge 2014-03-27 22:26:58 +01:00
Nirbhay Choubey
02ba2bfdb4 Merging revision from codership-mysql/5.5 (r3928..3968) and
codership-mysql/5.6 (r4021..4065).
- Also contains fixes for some build failures.
2014-03-27 16:26:00 -04: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
Nirbhay Choubey
90e4f7f9d3 * bzr merge -rtag:mariadb-10.0.9 maria/10.0
* Fix for post-merge build failures.
2014-03-26 14:27:24 -04:00
Nirbhay Choubey
899f9801d4 bzr merge -r3946..3968 codership/5.5 2014-03-25 17:01:05 -04: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
Sergei Golubchik
10740939eb 5.5 merge 2014-03-26 22:25:38 +01:00
Sergei Golubchik
9950c5c7ba MDEV-5892 Centos startup script is broken
Don't try to be smart about --socket.
Assume that if user has set up a non-standard location for a socket,
she did it consistently for both a server and clients
(otherwise most clients won't work anyway).
2014-03-19 10:02:41 +01:00
Michael Widenius
7b57dcb463 Fixed buildbot issues
mysql-test/suite/rpl/t/rpl_000011-slave.opt:
  Renamed test case as it's slave that needs to restarted
support-files/compiler_warnings.supp:
  Fixed bad characters in suppression
2014-03-18 16:26:02 +02:00
Michael Widenius
1127d56735 Fixed some buildbot failures
mysql-test/suite/rpl/t/rpl_000011-master.opt:
  Added master.opt file to ensure that other tests don't interfere with rpl_000011
plugin/server_audit/server_audit.c:
  Fixed compiler error on solaris
support-files/compiler_warnings.supp:
  Ignore warning from xtradb
2014-03-18 10:26:50 +02:00
Michael Widenius
a10a9448b0 Added new states to be able to better diagnose where server hangs.
- Table locks now ends with state "After table lock"
- Open table now ends with state "After opening tables"
- All calls to close_thread_tables(), not only from mysql_execute_command(), has state "closing tables"
- Added state "executing" for mysql admin commands, like CACHE INDEX, REPAIR TABLE etc.
- Added state "Finding key cache" for CACHE INDEX
- Added state "Filling schema table" when we generate temporary table for SHOW commands and information schema.

Other things:
Add limit from innobase for thread_sleep_delay. This fixed a failing tests case.
Added db.opt to support-files to make 'make package' work


mysql-test/suite/funcs_1/datadict/processlist_val.inc:
  Use new state
mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result:
  Updated test result because of new state
mysql-test/suite/funcs_1/r/processlist_val_no_prot.result:
  Updated test result because of new state
sql/CMakeLists.txt:
  Have option files in support-files
sql/lock.cc:
  Added new state 'After table lock'
sql/sql_admin.cc:
  Added state "executing" and "Sending data" for mysql admin commands, like CACHE INDEX, REPAIR TABLE etc.
  Added state "Finding key cache"
sql/sql_base.cc:
  open tables now ends with state "After table lock", instead of NULL
sql/sql_parse.cc:
  Moved state "closing tables" to close_thread_tables()
sql/sql_show.cc:
  Added state "Filling schema table" when we generate temporary table for SHOW commands and information schema.
storage/xtradb/buf/buf0buf.c:
  Removed compiler warning
storage/xtradb/handler/ha_innodb.cc:
  Add limit from innobase for thread_sleep_delay. This fixed a failing tests case.
support-files/db.opt:
  cmakes needs this to create data/test directory
2014-05-03 19:12:17 +03:00
Nirbhay Choubey
87910f7d30 MDEV#5759 Init script contains syntax error
Fixed the init script.
2014-02-27 17:56:28 -05:00
Sergei Golubchik
0dc23679c8 10.0-base merge 2014-02-26 15:28:07 +01:00
Nirbhay Choubey
ae6e1548cb Merge from maria/5.5 (-rtag:mariadb-5.5.36). 2014-02-25 17:49:41 -05:00
Sergei Golubchik
0b9a0a3517 5.5 merge 2014-02-25 16:04:35 +01:00
Murthy Narkedimilli
075a2fb716 Updated/added copyright header. Added line "use is subject to license terms"
to copyright header.
2014-02-17 18:19:04 +05:30
Murthy Narkedimilli
42bfa90874 Updated/added copyright header. Added line "use is subject to license terms"
to copyright header.
2014-02-17 18:19:04 +05:30
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