Commits · b712dce3d57335d3957afe94d1c3200880aebe99 · Kirill Smelkov / mariadb

10 Nov, 2009 1 commit
- Auto-merge from mysql-next-mr. · b712dce3
  Alexander Nozdrin authored Nov 10, 2009
  
  b712dce3
09 Nov, 2009 4 commits
- Fix manual-merge (2nd attempt). · 49bb8cba
  Alexander Nozdrin authored Nov 10, 2009
  
  49bb8cba
- Auto-merge from mysql-trunk-merge. · a15de184
  Alexander Nozdrin authored Nov 09, 2009
  
  a15de184
- Fix manual-merge. · 831c8434
  Alexander Nozdrin authored Nov 09, 2009
  
  831c8434
- Fix innodb.test due to Bug#48636. · fae99a38
  Alexander Nozdrin authored Nov 09, 2009
  
  fae99a38
06 Nov, 2009 12 commits
- Auto-merge from mysql-trunk-merge. · 966e0d9d
  Alexander Nozdrin authored Nov 06, 2009
  
  966e0d9d
- Manual merge from mysql-trunk-merge. · 6b1d61ec
  Alexander Nozdrin authored Nov 06, 2009
  
  6b1d61ec
- Auto-merge from mysql-trunk-merge. · ae71ffc1
  Alexander Nozdrin authored Nov 06, 2009
  
  ae71ffc1
- Auto-merge from mysql-trunk-merge. · e6d79c2b
  Alexander Nozdrin authored Nov 06, 2009
  
  e6d79c2b
- Manual merge from mysql-trunk-merge. · ea0bbb72
  Alexander Nozdrin authored Nov 06, 2009
  
  ea0bbb72
- Manual merge from mysql-trunk-merge. · 7cd11f45
  Alexander Nozdrin authored Nov 06, 2009
  
  7cd11f45
- Auto-merge from mysql-trunk-merge. · 5462a6db
  Alexander Nozdrin authored Nov 06, 2009
  
  5462a6db
- Null-merge patch for Bug#47627 · b3b4137d
  Alexander Nozdrin authored Nov 06, 2009
```
(revision-id: kristofer.pettersson@sun.com-20091019074333-g2ces0lo4c2ejar7),
because it broke the tree and was reverted later.
```
  b3b4137d
- Manual-merge from mysql-trunk-merge. · e253068b
  Alexander Nozdrin authored Nov 06, 2009
  
  e253068b
- Auto-merge from mysql-trunk-merge. · 85929aac
  Alexander Nozdrin authored Nov 06, 2009
  
  85929aac
- Auto-merge from mysql-trunk-merge. · 1a072883
  Alexander Nozdrin authored Nov 06, 2009
  
  1a072883
- Manual merge from mysql-trunk-merge. · 52b1bfe4
  Alexander Nozdrin authored Nov 06, 2009
```
Fix partition_column.test.
```
  52b1bfe4
05 Nov, 2009 23 commits
- Manual merge from mysql-trunk-merge. · eed607b8
  Alexander Nozdrin authored Nov 05, 2009
  
  eed607b8
- Manual merge from mysql-trunk-merge. · cd14c47c
  Alexander Nozdrin authored Nov 05, 2009
  
  cd14c47c
- Manual merge from mysql-5.1. · e0c62aad
  Alexander Nozdrin authored Nov 05, 2009
  
  e0c62aad
- Fix automerge: use 'thd->query()' instead of 'thd->query'. · 120425cc
  Alexander Nozdrin authored Nov 05, 2009
  
  120425cc
- Manually applied fix for innodb_bug39438 test from 5.1. · 45c2de8f
  Sergey Vojtovich authored Nov 05, 2009
  
  45c2de8f
- Updates for test cases from innodb-zip-ss6129. · 345c79ed
  Sergey Vojtovich authored Nov 05, 2009
  
  345c79ed
- Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk. · ced87194
  Sergey Vojtovich authored Nov 05, 2009
  
  ced87194
- Auto-merge from mysql-5.1. · 3e2c9aac
  Alexander Nozdrin authored Nov 05, 2009
  
  3e2c9aac
- Null-merge revid:svoj@sun.com-20091103091902-vwszwwpfi1f4zrpn from mysql-5.1 · d74f9f88
  Alexander Nozdrin authored Nov 05, 2009
  
  d74f9f88
- Auto-merge from mysql-next-mr. · d476bbb0
  Alexander Nozdrin authored Nov 05, 2009
  
  d476bbb0
- Auto-merge from mysql-5.1. · e1a2211a
  Alexander Nozdrin authored Nov 05, 2009
  
  e1a2211a
- Auto-merge from mysql-5.1. · 99d2c972
  Alexander Nozdrin authored Nov 05, 2009
  
  99d2c972
- Manual merge from mysql-5.1. · 132c439a
  Alexander Nozdrin authored Nov 05, 2009
  
  132c439a
- Auto-merge from mysql-5.1. · 89cfb564
  Alexander Nozdrin authored Nov 05, 2009
  
  89cfb564
- Auto-merge from mysql-5.1. · ff867d21
  Alexander Nozdrin authored Nov 05, 2009
  
  ff867d21
- Auto-merge from mysql-5.1. · 660043ab
  Alexander Nozdrin authored Nov 05, 2009
  
  660043ab
- Manual merge from mysql-5.1. · 5bbacc52
  Alexander Nozdrin authored Nov 05, 2009
  
  5bbacc52
- Manual merge from mysql-5.1. · c063bd17
  Alexander Nozdrin authored Nov 05, 2009
  
  c063bd17
- Auto-merge from mysql-5.1. · b40aed07
  Alexander Nozdrin authored Nov 05, 2009
  
  b40aed07
- Auto-merge from mysql-5.1. · 0fd7ff87
  Alexander Nozdrin authored Nov 05, 2009
  
  0fd7ff87
- Auto-merge from mysql-5.1. · bd659be6
  Alexander Nozdrin authored Nov 05, 2009
  
  bd659be6
- Manual merge from mysql-5.1. · a35e0131
  Alexander Nozdrin authored Nov 05, 2009
  
  a35e0131
- Manual merge from mysql-5.1. · b30c1886
  Alexander Nozdrin authored Nov 05, 2009
  
  b30c1886