Commit graph

59393 commits

Author SHA1 Message Date
Alexander Nozdrin
e89a561d52 Auto-merge from mysql-trunk-merge. 2009-11-06 19:15:09 +03:00
Alexander Nozdrin
35b00a182e Manual merge from mysql-trunk-merge. 2009-11-06 19:13:33 +03:00
Alexander Nozdrin
f56223598e Auto-merge from mysql-trunk-merge. 2009-11-06 18:33:37 +03:00
Alexander Nozdrin
db6334d49e Auto-merge from mysql-trunk-merge. 2009-11-06 18:28:25 +03:00
Alexander Nozdrin
9c61ec687f Manual merge from mysql-trunk-merge. 2009-11-06 18:19:24 +03:00
Alexander Nozdrin
2ca5b2c791 Manual merge from mysql-trunk-merge. 2009-11-06 17:20:27 +03:00
Mikael Ronstrom
d4ca8b12cd Review fixes for BUG#48161 and BUG#48447 2009-11-06 11:49:27 +01:00
Alexander Nozdrin
7a90f041cc Auto-merge from mysql-trunk-merge. 2009-11-06 13:32:54 +03:00
Alexander Nozdrin
4d0c2629cd Null-merge patch for Bug#47627
(revision-id: kristofer.pettersson@sun.com-20091019074333-g2ces0lo4c2ejar7),
because it broke the tree and was reverted later.
2009-11-06 13:30:41 +03:00
Alexander Nozdrin
f956ea3771 Manual-merge from mysql-trunk-merge. 2009-11-06 12:52:45 +03:00
Alexander Nozdrin
112d9fd9db Auto-merge from mysql-trunk-merge. 2009-11-06 12:37:00 +03:00
Alexander Nozdrin
d9d3271da3 Auto-merge from mysql-trunk-merge. 2009-11-06 12:17:01 +03:00
Alexander Nozdrin
ab2450efd5 Manual merge from mysql-trunk-merge.
Fix partition_column.test.
2009-11-06 11:56:48 +03:00
Alexander Nozdrin
ef862653af Manual merge from mysql-trunk-merge. 2009-11-05 23:48:01 +03:00
Alexander Nozdrin
f620cae974 Manual merge from mysql-trunk-merge. 2009-11-05 23:28:35 +03:00
Alexander Nozdrin
2242926ae0 Manual merge from mysql-5.1. 2009-11-05 17:59:05 +03:00
Alexander Nozdrin
3cf6345535 Fix automerge: use 'thd->query()' instead of 'thd->query'. 2009-11-05 17:51:00 +03:00
Mikael Ronstrom
09580562a2 BUG#48447, BUG#48161, fixed a regression from fix of BUG#6045, where binary collations can use indexes/partition pruning for cases using equality conditions, however it cannot be used for any other condition like <, >, <=, >=, <>, also added test case for verification of BUG#47774 in this patch 2009-11-05 15:42:03 +01:00
Sergey Vojtovich
cbe94583c2 Manually applied fix for innodb_bug39438 test from 5.1. 2009-11-05 18:06:28 +04:00
Sergey Vojtovich
2cd0b2f373 Updates for test cases from innodb-zip-ss6129. 2009-11-05 17:23:50 +04:00
Sergey Vojtovich
21fad4ee1f Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk. 2009-11-05 16:29:58 +04:00
Alexander Nozdrin
26fc558319 Auto-merge from mysql-5.1. 2009-11-05 15:13:16 +03:00
Alexander Nozdrin
dae191d36a Null-merge revid:svoj@sun.com-20091103091902-vwszwwpfi1f4zrpn from mysql-5.1 2009-11-05 15:10:39 +03:00
Alexander Nozdrin
411a6bfeb9 Auto-merge from mysql-next-mr. 2009-11-05 15:08:37 +03:00
Alexander Nozdrin
258ec2ebaa Auto-merge from mysql-5.1. 2009-11-05 14:03:16 +03:00
Alexander Nozdrin
13f1ace38b Auto-merge from mysql-5.1. 2009-11-05 13:59:58 +03:00
Alexander Nozdrin
110835764b Manual merge from mysql-5.1. 2009-11-05 13:58:14 +03:00
Alexander Nozdrin
b591221eb1 Auto-merge from mysql-5.1. 2009-11-05 12:38:14 +03:00
Alexander Nozdrin
f51d08921a Auto-merge from mysql-5.1. 2009-11-05 12:37:26 +03:00
Alexander Nozdrin
018358415f Auto-merge from mysql-5.1. 2009-11-05 12:36:34 +03:00
Magne Mahre
b921e93f80 Fix compile error on HP/UX.
SIGWINCH is not defined in termios.h on HP/UX.
2009-11-05 10:31:58 +01:00
Alexander Nozdrin
e6fffedb27 Manual merge from mysql-5.1. 2009-11-05 12:23:55 +03:00
Alexander Nozdrin
5ae8ae3a8e Manual merge from mysql-5.1. 2009-11-05 12:20:41 +03:00
Alexander Nozdrin
8b78a6af01 Auto-merge from mysql-5.1. 2009-11-05 12:14:01 +03:00
Alexander Nozdrin
39822f2367 Auto-merge from mysql-5.1. 2009-11-05 12:02:44 +03:00
Alexander Nozdrin
55cb8c77fa Auto-merge from mysql-5.1. 2009-11-05 12:02:03 +03:00
Alexander Nozdrin
09ff80f2a0 Manual merge from mysql-5.1. 2009-11-05 11:48:06 +03:00
Alexander Nozdrin
85f3e8ce24 Manual merge from mysql-5.1. 2009-11-05 11:40:01 +03:00
hery.ramilison@sun.com
c5a3082806 Raise version number after cloning 5.1.41 2009-11-04 19:22:09 +01:00
Magne Mahre
6eb797f973 BUG #8368 "mysqldump needs --slave-data option"
Added this option, named as "--dump-slave". The purpose of this option is to be
able to produce a dump from a slave used for making backups of the master. Originally,
dumping from the main master was fine, but as more data accumulated, the dump process
would take over 30 minutes, locking up the master database hence website for 30 minutes.
A slave dedicated to producing backups was the answer, but I needed a dump that could be

used to restore a slave instantly and in order to do that, it has to have three things 
contained in the dump:
  
  1. "STOP SLAVE;" at the beginning
  2. "CHANGE MASTER TO ...<the master - info from 'show slave status'>"
  3. "START SLAVE;" at the end
  
These options in this changeset contain this.
  
  --stop-slave adds "STOP SLAVE" to the beginning of the dump and "STOP SLAVE" 
  to the end of the dump.
  
  --include-host gives the user the option to have the host explicitely added
  to the "CHANGE MASTER TO ..." line.
  
  --dump-slave adds the "CHANGE MASTER ..." to the dump representing not the slave's
  master binlog info, but the slave's master's info from "SHOW SLAVE STATUS"
2009-11-04 14:31:03 +01:00
Magne Mahre
e30e0b7c7d Bug#26780: automatic vertical output for wide results
Feature from Eric Bergen, CLA signed 2007-06-27.
  
Adds new mysql client option "--auto-vertical-output", which causes
the client to test whether a result table is too wide for the current
window (where available) and emit vertical results in that case.
Otherwise, it sends normal tabular results.
2009-11-04 13:20:02 +01:00
Jon Olav Hauglid
df6d4bf1b4 Bug #43867 ALTER TABLE on a partitioned table causes unnecessary
deadlocks

Backport of revno: 2617.68.35

The problem was that if one connection is running a multi-statement 
transaction which involves a single partitioned table, and another 
connection attempts to alter the table to drop a non-existing partition,
(which of course will fail), the first connection still gets 
ER_LOCK_DEADLOCK and cannot proceed anymore.

This bug is no longer reproducable. This has also been tested with the
patch for Bug#46654 "False deadlock on concurrent DML/DDL with partitions, 
inconsistent behavior" which concerned a similar problem but where the 
ALTER TABLE is semantically correct.

Test case added in partition_sync.test.
2009-11-04 12:59:46 +01:00
Magne Mahre
948bb3e6dc Bug#42664: Sign ignored for TIME types when not comparing as longlong
Another code-path dropped sign of TIME, presuming all time is positive.
      
Minds sign now. Patch depends on ChangeSet for 42661.
2009-11-04 11:28:50 +01:00
Georgi Kodinov
eeef23ec24 merge 2009-11-04 11:21:52 +02:00
Georgi Kodinov
c96baff6c1 merge 2009-11-04 11:18:34 +02:00
Magne Mahre
491b8fc755 Backport to 5.6.0 2009-11-04 10:17:39 +01:00
Georgi Kodinov
721d739086 version change 2009-11-04 11:13:55 +02:00
Georgi Kodinov
10ef8dd191 Disabled the rpl_killed_ddl test in 5.0 because of bug #45520 2009-11-04 11:13:22 +02:00
Magne Mahre
b1006c87f7 Bug#42661: sec_to_time() and signedness
Bug#42662: maketime() and signedness
      
Item_time_typecast::val_int() dropped sign from
MYSQL_TIME gotten using from get_time().
      
Propagates sign now.


Backported to 5.5.0  (6.0-codebase revid: 1810.3897.1)
2009-11-04 09:53:38 +01:00
Mikael Ronstrom
06bfaf21f2 Fixed a use of non-initialised variable, cannot use NULL flags if RANGE == NO_MAX_RANGE or NO_MIN_RANGE, so need to check NULL flags after checking the RANGE isn't NO_MAX_RANGE 2009-11-04 09:30:52 +01:00