Commits · 3c3495b0e7cbade2df9c4bc1e6d15ecc75f1ba7a · nexedi / MariaDB

09 Nov, 2009 4 commits
- Fix manual-merge (2nd attempt). · 3c3495b0
  Alexander Nozdrin authored Nov 10, 2009
  
  3c3495b0
- Auto-merge from mysql-trunk-merge. · 87149cf6
  Alexander Nozdrin authored Nov 09, 2009
  
  87149cf6
- Fix manual-merge. · 6618bdd4
  Alexander Nozdrin authored Nov 09, 2009
  
  6618bdd4
- Fix innodb.test due to Bug#48636. · 18819ca9
  Alexander Nozdrin authored Nov 09, 2009
  
  18819ca9
06 Nov, 2009 12 commits
- Auto-merge from mysql-trunk-merge. · 3fcc64f3
  Alexander Nozdrin authored Nov 06, 2009
  
  3fcc64f3
- Manual merge from mysql-trunk-merge. · 6fc90d86
  Alexander Nozdrin authored Nov 06, 2009
  
  6fc90d86
- Auto-merge from mysql-trunk-merge. · 284a220a
  Alexander Nozdrin authored Nov 06, 2009
  
  284a220a
- Auto-merge from mysql-trunk-merge. · 95ab6b85
  Alexander Nozdrin authored Nov 06, 2009
  
  95ab6b85
- Manual merge from mysql-trunk-merge. · a49d612b
  Alexander Nozdrin authored Nov 06, 2009
  
  a49d612b
- Manual merge from mysql-trunk-merge. · 2c6d5a77
  Alexander Nozdrin authored Nov 06, 2009
  
  2c6d5a77
- Auto-merge from mysql-trunk-merge. · 4c5c70db
  Alexander Nozdrin authored Nov 06, 2009
  
  4c5c70db
- Null-merge patch for Bug#47627 · 196b5965
  Alexander Nozdrin authored Nov 06, 2009
```
(revision-id: kristofer.pettersson@sun.com-20091019074333-g2ces0lo4c2ejar7),
because it broke the tree and was reverted later.
```
  196b5965
- Manual-merge from mysql-trunk-merge. · 244276ab
  Alexander Nozdrin authored Nov 06, 2009
  
  244276ab
- Auto-merge from mysql-trunk-merge. · 04830865
  Alexander Nozdrin authored Nov 06, 2009
  
  04830865
- Auto-merge from mysql-trunk-merge. · f78adf0d
  Alexander Nozdrin authored Nov 06, 2009
  
  f78adf0d
- Manual merge from mysql-trunk-merge. · 3fab2a16
  Alexander Nozdrin authored Nov 06, 2009
```
Fix partition_column.test.
```
  3fab2a16
05 Nov, 2009 22 commits
- Manual merge from mysql-trunk-merge. · 35c6b518
  Alexander Nozdrin authored Nov 05, 2009
  
  35c6b518
- Manual merge from mysql-trunk-merge. · 7a568acc
  Alexander Nozdrin authored Nov 05, 2009
  
  7a568acc
- Manual merge from mysql-5.1. · 530c4bff
  Alexander Nozdrin authored Nov 05, 2009
  
  530c4bff
- Fix automerge: use 'thd->query()' instead of 'thd->query'. · 55dfb4fa
  Alexander Nozdrin authored Nov 05, 2009
  
  55dfb4fa
- Manually applied fix for innodb_bug39438 test from 5.1. · d23a90b3
  Sergey Vojtovich authored Nov 05, 2009
  
  d23a90b3
- Updates for test cases from innodb-zip-ss6129. · 96491f9b
  Sergey Vojtovich authored Nov 05, 2009
  
  96491f9b
- Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk. · 525ed8ca
  Sergey Vojtovich authored Nov 05, 2009
  
  525ed8ca
- Auto-merge from mysql-5.1. · 2aeb042d
  Alexander Nozdrin authored Nov 05, 2009
  
  2aeb042d
- Null-merge revid:svoj@sun.com-20091103091902-vwszwwpfi1f4zrpn from mysql-5.1 · 9074a275
  Alexander Nozdrin authored Nov 05, 2009
  
  9074a275
- Auto-merge from mysql-5.1. · b024319e
  Alexander Nozdrin authored Nov 05, 2009
  
  b024319e
- Auto-merge from mysql-5.1. · 643eef8c
  Alexander Nozdrin authored Nov 05, 2009
  
  643eef8c
- Manual merge from mysql-5.1. · d31713f7
  Alexander Nozdrin authored Nov 05, 2009
  
  d31713f7
- Auto-merge from mysql-5.1. · ec4f21c9
  Alexander Nozdrin authored Nov 05, 2009
  
  ec4f21c9
- Auto-merge from mysql-5.1. · b5e3edea
  Alexander Nozdrin authored Nov 05, 2009
  
  b5e3edea
- Auto-merge from mysql-5.1. · 8c7b5c69
  Alexander Nozdrin authored Nov 05, 2009
  
  8c7b5c69
- Manual merge from mysql-5.1. · 95d08139
  Alexander Nozdrin authored Nov 05, 2009
  
  95d08139
- Manual merge from mysql-5.1. · 9e00173b
  Alexander Nozdrin authored Nov 05, 2009
  
  9e00173b
- Auto-merge from mysql-5.1. · ba08d6b8
  Alexander Nozdrin authored Nov 05, 2009
  
  ba08d6b8
- Auto-merge from mysql-5.1. · af82d889
  Alexander Nozdrin authored Nov 05, 2009
  
  af82d889
- Auto-merge from mysql-5.1. · f24bf00f
  Alexander Nozdrin authored Nov 05, 2009
  
  f24bf00f
- Manual merge from mysql-5.1. · febbb91c
  Alexander Nozdrin authored Nov 05, 2009
  
  febbb91c
- Manual merge from mysql-5.1. · 56e21885
  Alexander Nozdrin authored Nov 05, 2009
  
  56e21885
04 Nov, 2009 2 commits
- Raise version number after cloning 5.1.41 · 167a3d2e
  unknown authored Nov 04, 2009
  
  167a3d2e
- merge · 8864a933
  Georgi Kodinov authored Nov 04, 2009
  
  8864a933