Commit graph

749 commits

Author SHA1 Message Date
Alexander Nozdrin
6f95733406 Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing.
Conflicts:
  - mysql-test/r/mysqld--help-win.result
  - sql/sys_vars.cc

Original revsion (in next-mr-bugfixing):
------------------------------------------------------------
revno: 2971 [merge]
revision-id: alfranio.correia@sun.com-20100121210527-rbuheu5rnsmcakh1
committer: Alfranio Correia <alfranio.correia@sun.com>
branch nick: mysql-next-mr-bugfixing
timestamp: Thu 2010-01-21 21:05:27 +0000
message:
  BUG#46364 MyISAM transbuffer problems (NTM problem)
        
  It is well-known that due to concurrency issues, a slave can become
  inconsistent when a transaction contains updates to both transaction and
  non-transactional tables.
                      
  In a nutshell, the current code-base tries to preserve causality among the
  statements by writing non-transactional statements to the txn-cache which
  is flushed upon commit. However, modifications done to non-transactional
  tables on behalf of a transaction become immediately visible to other
  connections but may not immediately get into the binary log and therefore
  consistency may be broken.
              
  In general, it is impossible to automatically detect causality/dependency
  among statements by just analyzing the statements sent to the server. This
  happen because dependency may be hidden in the application code and it is
  necessary to know a priori all the statements processed in the context of
  a transaction such as in a procedure. Moreover, even for the few cases that
  we could automatically address in the server, the computation effort
  required could make the approach infeasible.
              
  So, in this patch we introduce the option
        - "--binlog-direct-non-transactional-updates" that can be used to bypass
        the current behavior in order to write directly to binary log statements
        that change non-transactional tables.
  
  Besides, it is used to enable the WL#2687 which is disabled by default.
    ------------------------------------------------------------
    revno: 2970.1.1
    revision-id: alfranio.correia@sun.com-20100121131034-183r4qdyld7an5a0
    parent: alik@sun.com-20100121083914-r9rz2myto3tkdya0
    committer: Alfranio Correia <alfranio.correia@sun.com>
    branch nick: mysql-next-mr-bugfixing
    timestamp: Thu 2010-01-21 13:10:34 +0000
    message:
      BUG#46364 MyISAM transbuffer problems (NTM problem)
            
      It is well-known that due to concurrency issues, a slave can become
      inconsistent when a transaction contains updates to both transaction and
      non-transactional tables.
                          
      In a nutshell, the current code-base tries to preserve causality among the
      statements by writing non-transactional statements to the txn-cache which
      is flushed upon commit. However, modifications done to non-transactional
      tables on behalf of a transaction become immediately visible to other
      connections but may not immediately get into the binary log and therefore
      consistency may be broken.
                  
      In general, it is impossible to automatically detect causality/dependency
      among statements by just analyzing the statements sent to the server. This
      happen because dependency may be hidden in the application code and it is
      necessary to know a priori all the statements processed in the context of
      a transaction such as in a procedure. Moreover, even for the few cases that
      we could automatically address in the server, the computation effort
      required could make the approach infeasible.
                  
      So, in this patch we introduce the option
            - "--binlog-direct-non-transactional-updates" that can be used to bypass
            the current behavior in order to write directly to binary log statements
            that change non-transactional tables.
      
      Besides, it is used to enable the WL#2687 which is disabled by default.
2010-02-02 10:56:42 +03:00
Alexander Nozdrin
0835775b7c Manual merge from mysql-trunk.
Conflicts:
  - support-files/mysql.spec.sh
2010-01-18 23:15:17 +03:00
Alexey Kopytov
0a5b406fc5 Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:

Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/sql_acl.cc
Text conflict in sql/sql_servers.cc
Text conflict in sql/sql_update.cc
Text conflict in support-files/mysql.spec.sh
2010-01-15 14:26:53 +03:00
Georgi Kodinov
90274e3709 merge 2010-01-13 12:47:42 +02:00
Georgi Kodinov
6e72f4171f merge 5.1-main to 5.1-bugteam 2010-01-13 12:28:42 +02:00
Joerg Bruehe
c591ee5923 Upmerge the changes for RPM versioning/naming from 5.0 to 5.1.
This includes "MYSQL_U_SCORE_VERSION" in "configure.in".
2010-01-12 12:57:51 +01:00
Joerg Bruehe
71465af9d4 Implement the change of RPM versioning and file naming:
- "release" starts from 1
- "level" ("m2", "rc", ...) is included in the RPM version.
2010-01-12 12:41:18 +01:00
Joerg Bruehe
3c9322e73f Implement the change of RPM versioning and file naming:
- "release" starts from 1
- "level" ("m2", "rc", ...) is included in the RPM version.
2010-01-11 19:23:36 +01:00
Joerg Bruehe
c55a0048cc Ensure that the variable "MYSQL_U_SCORE_VERSION" is expanded
whereever it is used (currently, only RPM spec files).
2010-01-04 15:03:09 +01:00
Kent Boortz
71061de025 Removed unwanted Perl DBI dependency 2009-12-30 23:06:14 +01:00
Joerg Bruehe
3be15fa67c Remove the "fix_privilege_tables" manual from the RPM spec file,
there is none in 5.5.
2009-12-23 22:42:44 +01:00
Joerg Bruehe
f7c24a2e20 The "semisync" plugin file name has lost its introductory "lib",
adapt the file lists for the subpackages.

This is a part missing from the fix for bug#48351.
2009-12-23 13:06:41 +01:00
Joerg Bruehe
7a84896d71 Change RPM file naming:
- Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
- Release counts from 1, not 0.

This is done for both the "generic" RPMs and the "shared-compat" ones.
It includes introducing a new version variable "MYSQL_U_SCORE_VERSION"
in "configure.in", where the dash is replaced by an underscore:
  5.5.1-m2   ->  5.5.1_m2
2009-12-22 23:22:42 +01:00
Alexander Nozdrin
f238adf75d Manual merge from mysql-trunk.
Conflicts:
  - storage/ibmdb2i/ha_ibmdb2i.cc
2009-12-22 09:31:24 +03:00
Joerg Bruehe
6ddab77da2 Automerge the build fixes of 5.5.0-m2 back into the tree. 2009-12-16 14:11:20 +01:00
Jonathan Perkin
ed02cca13a Fix previous merge: 'kill -0' (check PID exists) was changed to 'kill -9',
meaning a '/etc/init.d/mysql stop' would actually cause mysqld_safe to
relaunch mysqld rather than shut it down.
2009-12-16 10:27:56 +00:00
Alexander Nozdrin
78c61d6b83 Remove .cvsignore files (attempt #2). 2009-12-16 11:24:30 +03:00
MySQL Build Team
4746239b37 Handle the "semisync" plugin in
- binary distributions for Windows,
- "generic" RPM packages.
2009-11-26 19:55:33 +01:00
MySQL Build Team
63a044f31f Remove erroneous traces of the InnoDB plugin (that is 5.1 only)
from the "spec" file for generic RPMs.
2009-11-18 11:42:20 +01:00
MySQL Build Team
1da38990cb Change the control structures which the RPM spec file uses to govern
the inclusion of a separate malloc library (used for Google's "tcmalloc")
to follow the pattern used for other optional parts.

This is still experimental, there are some "rpmbuild" issues around this.
2009-11-17 17:19:00 +01:00
Alexander Nozdrin
2c3d501189 Automerge from mysql-trunk-merge. 2009-10-19 22:41:18 +04:00
Alexander Nozdrin
a1ac1b7d48 Automerge from mysql-trunk. 2009-10-19 22:40:08 +04:00
Timothy Smith
df129b749d Merge from mysql-5.4.3-beta-release 2009-10-16 20:19:36 +02:00
Timothy Smith
d87592ec52 Update _libdir/plugin to _libdir/mysql/plugin in a few places 2009-10-16 19:59:23 +02:00
Alexander Nozdrin
c30d924dd5 Manual merge from mysql-trunk-merge. 2009-10-14 12:25:39 +04:00
Alexander Nozdrin
c69629d269 Merge from mysql-5.1. 2009-10-13 13:42:38 +04:00
Alexander Nozdrin
21916790a1 Backport WL#4085: Merge revno:2617.56.29 from 6.0. 2009-10-06 14:57:07 +04:00
Alexander Nozdrin
0191eb8d3e Backport WL#4085: Merge revno:2476.1338.9 from 6.0. 2009-10-06 14:53:47 +04:00
unknown
4188fcbd55 make_binary_distribution and mysql.spec: add options to copy a shared library, for use by mysqld_safe, into pkglibdir during package creation 2009-09-29 08:58:32 +02:00
Jonathan Perkin
54631d6168 Merge up to mysql-5.1-bugteam 2009-09-28 17:32:14 +01:00
Jonathan Perkin
ea295c233b bug#30954: "configure" script in binary distributions considered harmfull
Add --help option.
2009-09-28 15:14:33 +01:00
Alexander Nozdrin
ede2edd19b Merge from mysql-5.1. 2009-09-19 13:07:51 +04:00
Joerg Bruehe
55eb4962c2 Merge the changes done for 5.4.2-beta into "trunk". 2009-09-09 15:21:27 +02:00
Joerg Bruehe
eb26de2356 The former "Instance Manager" (program "mysqlmanager")
is not being built in 5.4.2-beta,
so it cannot be included in a RPM:
Remove both the program and the man page from the spec file.

This patch was applied during the build of 5.4.2-beta.
2009-09-08 15:48:55 +02:00
Jonathan Perkin
0644b0acfa Merge from mysql-5.1.38-release 2009-09-03 01:48:06 +02:00
Joerg Bruehe
905d715f10 Merge 5.1 up into 5.4-build ("trunk"). 2009-08-29 21:26:00 +02:00
Jonathan Perkin
74092a8e5b Disable ftexample to match other packages, ride previous changelog entry. 2009-08-25 13:00:23 +02:00
Jonathan Perkin
c2bd07ca9c Tidy previous, put example storage engine back as it's used by tests. 2009-08-24 14:06:01 +02:00
Jonathan Perkin
8a2454f8e9 Apply changes from mysql-5.1.38-release clone:
- Add conditionals for bundled zlib and innodb plugin.
 - Apply patch from bug#46834 to install the test suite in RPMs.
 - Add plugins to RPMs.  Disable example plugins.
2009-08-24 10:13:34 +01:00
Jonathan Perkin
df91ff571b Add conditionals for bundled zlib and innodb plugin 2009-08-24 10:50:04 +02:00
Jonathan Perkin
769d9f3803 Apply patch from bug#46834 to install the test suite in RPMs. 2009-08-21 13:58:33 +02:00
Jonathan Perkin
58903aecd3 Add plugins to RPMs. Disable example plugins. 2009-08-21 13:52:30 +02:00
Guilhem Bichot
eceba8912c merge of 5.1-main into mysql-trunk.
Changes to ha_innodb.cc are not propagated to plugin, they will come back
via Oracle/Innobase if needed.
2009-08-12 15:44:34 +02:00
Guilhem Bichot
b57e4dbd88 Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:
bzr branch mysql-5.1-performance-version mysql-trunk # Summit
cd mysql-trunk
bzr merge mysql-5.1-innodb_plugin # which is 5.1 + Innodb plugin 
bzr rm innobase # remove the builtin
Next step: build, test fixes.
2009-08-04 13:25:19 +02:00
Daniel Fischer
69945c6169 merge patch for bug#31785 2009-07-02 15:18:12 +02:00
Mikael Ronstrom
c75a265381 Merged in 5.1.35 2009-07-01 14:36:40 +02:00
Georgi Kodinov
c4930f3505 automerge 2009-06-12 17:07:47 +03:00
Georgi Kodinov
dfb06c38c9 fixed the build-tags command 2009-06-12 17:06:59 +03:00
Mikael Ronstrom
a22c8c5be5 Merge MySQL 5.1.35 into MySQL 5.4 2009-06-11 12:07:59 +02:00
Alexey Botchkov
67117576d0 Bug#44470 innodb_file_io_threads precludes mysql from starting
the innodb_file_io_threads option isn't present here.
    Changed with the innodb_read/write_io_threads

per-file comments:
  support-files/my-innodb-heavy-4G.cnf.sh
2009-06-04 19:37:20 +05:00