Commits · 6a795bf3b93a0e0948ff65d0df01d008a59a8e30 · nexedi / MariaDB

09 Nov, 2009 3 commits
- Auto-merge from mysql-trunk-merge. · 6a795bf3
  Alexander Nozdrin authored Nov 09, 2009
  
  6a795bf3
- Fix manual-merge. · 72362ac7
  Alexander Nozdrin authored Nov 09, 2009
  
  72362ac7
- Fix innodb.test due to Bug#48636. · 157affe8
  Alexander Nozdrin authored Nov 09, 2009
  
  157affe8
06 Nov, 2009 12 commits
- Auto-merge from mysql-trunk-merge. · e89a561d
  Alexander Nozdrin authored Nov 06, 2009
  
  e89a561d
- Manual merge from mysql-trunk-merge. · 35b00a18
  Alexander Nozdrin authored Nov 06, 2009
  
  35b00a18
- Auto-merge from mysql-trunk-merge. · f5622359
  Alexander Nozdrin authored Nov 06, 2009
  
  f5622359
- Auto-merge from mysql-trunk-merge. · db6334d4
  Alexander Nozdrin authored Nov 06, 2009
  
  db6334d4
- Manual merge from mysql-trunk-merge. · 9c61ec68
  Alexander Nozdrin authored Nov 06, 2009
  
  9c61ec68
- Manual merge from mysql-trunk-merge. · 2ca5b2c7
  Alexander Nozdrin authored Nov 06, 2009
  
  2ca5b2c7
- Auto-merge from mysql-trunk-merge. · 7a90f041
  Alexander Nozdrin authored Nov 06, 2009
  
  7a90f041
- Null-merge patch for Bug#47627 · 4d0c2629
  Alexander Nozdrin authored Nov 06, 2009
```
(revision-id: kristofer.pettersson@sun.com-20091019074333-g2ces0lo4c2ejar7),
because it broke the tree and was reverted later.
```
  4d0c2629
- Manual-merge from mysql-trunk-merge. · f956ea37
  Alexander Nozdrin authored Nov 06, 2009
  
  f956ea37
- Auto-merge from mysql-trunk-merge. · 112d9fd9
  Alexander Nozdrin authored Nov 06, 2009
  
  112d9fd9
- Auto-merge from mysql-trunk-merge. · d9d3271d
  Alexander Nozdrin authored Nov 06, 2009
  
  d9d3271d
- Manual merge from mysql-trunk-merge. · ab2450ef
  Alexander Nozdrin authored Nov 06, 2009
```
Fix partition_column.test.
```
  ab2450ef
05 Nov, 2009 22 commits
- Manual merge from mysql-trunk-merge. · ef862653
  Alexander Nozdrin authored Nov 05, 2009
  
  ef862653
- Manual merge from mysql-trunk-merge. · f620cae9
  Alexander Nozdrin authored Nov 05, 2009
  
  f620cae9
- Manual merge from mysql-5.1. · 2242926a
  Alexander Nozdrin authored Nov 05, 2009
  
  2242926a
- Fix automerge: use 'thd->query()' instead of 'thd->query'. · 3cf63455
  Alexander Nozdrin authored Nov 05, 2009
  
  3cf63455
- Manually applied fix for innodb_bug39438 test from 5.1. · cbe94583
  Sergey Vojtovich authored Nov 05, 2009
  
  cbe94583
- Updates for test cases from innodb-zip-ss6129. · 2cd0b2f3
  Sergey Vojtovich authored Nov 05, 2009
  
  2cd0b2f3
- Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk. · 21fad4ee
  Sergey Vojtovich authored Nov 05, 2009
  
  21fad4ee
- Auto-merge from mysql-5.1. · 26fc5583
  Alexander Nozdrin authored Nov 05, 2009
  
  26fc5583
- Null-merge revid:svoj@sun.com-20091103091902-vwszwwpfi1f4zrpn from mysql-5.1 · dae191d3
  Alexander Nozdrin authored Nov 05, 2009
  
  dae191d3
- Auto-merge from mysql-5.1. · 258ec2eb
  Alexander Nozdrin authored Nov 05, 2009
  
  258ec2eb
- Auto-merge from mysql-5.1. · 13f1ace3
  Alexander Nozdrin authored Nov 05, 2009
  
  13f1ace3
- Manual merge from mysql-5.1. · 11083576
  Alexander Nozdrin authored Nov 05, 2009
  
  11083576
- Auto-merge from mysql-5.1. · b591221e
  Alexander Nozdrin authored Nov 05, 2009
  
  b591221e
- Auto-merge from mysql-5.1. · f51d0892
  Alexander Nozdrin authored Nov 05, 2009
  
  f51d0892
- Auto-merge from mysql-5.1. · 01835841
  Alexander Nozdrin authored Nov 05, 2009
  
  01835841
- Manual merge from mysql-5.1. · e6fffedb
  Alexander Nozdrin authored Nov 05, 2009
  
  e6fffedb
- Manual merge from mysql-5.1. · 5ae8ae3a
  Alexander Nozdrin authored Nov 05, 2009
  
  5ae8ae3a
- Auto-merge from mysql-5.1. · 8b78a6af
  Alexander Nozdrin authored Nov 05, 2009
  
  8b78a6af
- Auto-merge from mysql-5.1. · 39822f23
  Alexander Nozdrin authored Nov 05, 2009
  
  39822f23
- Auto-merge from mysql-5.1. · 55cb8c77
  Alexander Nozdrin authored Nov 05, 2009
  
  55cb8c77
- Manual merge from mysql-5.1. · 09ff80f2
  Alexander Nozdrin authored Nov 05, 2009
  
  09ff80f2
- Manual merge from mysql-5.1. · 85f3e8ce
  Alexander Nozdrin authored Nov 05, 2009
  
  85f3e8ce
04 Nov, 2009 3 commits
- Raise version number after cloning 5.1.41 · c5a30828
  hery.ramilison@sun.com authored Nov 04, 2009
  
  c5a30828
- merge · eeef23ec
  Georgi Kodinov authored Nov 04, 2009
  
  eeef23ec
- merge · c96baff6
  Georgi Kodinov authored Nov 04, 2009
  
  c96baff6