Commits · d7ed74a36b3c594281a1459d2b77241ff1e1bbb4 · nexedi / MariaDB

05 Oct, 2009 2 commits
- null merge of 47383 from 5.1, does not apply · d7ed74a3
  Bjorn Munch authored Oct 05, 2009
  
  d7ed74a3
- null merge of 47383 from 5.1, does not apply · a47857cb
  Bjorn Munch authored Oct 05, 2009
  
  a47857cb
02 Oct, 2009 1 commit

Bug #47383 let mysql-test-run.pl run innodb tests using the plugin · e46fe1ca

Bjorn Munch authored Oct 02, 2009

Alt. solution: let the "InnoDB plugin" combinations apply
Added some alternative plugin paths (I need to move the code anyway)

e46fe1ca

23 Sep, 2009 14 commits
- null merge from trunk-mtr · 7e6392a4
  Bjorn Munch authored Sep 23, 2009
  
  7e6392a4
- null merge from 5.1-mtr · 59785088
  Bjorn Munch authored Sep 23, 2009
  
  59785088
- merge from -trunk · 3e14f87e
  Bjorn Munch authored Sep 23, 2009
  
  3e14f87e
- Update default.conf. · 8dd75c98
  Alexander Nozdrin authored Sep 23, 2009
  
  8dd75c98
- Merge from mysql-next-mr. · 9b9f814d
  Alexander Nozdrin authored Sep 23, 2009
  
  9b9f814d
- Merge from mysql-trunk. · 1bb4ba29
  Alexander Nozdrin authored Sep 23, 2009
  
  1bb4ba29
- Update default.conf. · 04fff1e8
  Alexander Nozdrin authored Sep 23, 2009
  
  04fff1e8
- Update default.conf. · e4ebc5c6
  Alexander Nozdrin authored Sep 23, 2009
  
  e4ebc5c6
- Merge from mysql-trunk. · 928de7ed
  Alexander Nozdrin authored Sep 23, 2009
  
  928de7ed
- Merge from mysql-trunk-alik. · abf845b9
  Alexander Nozdrin authored Sep 23, 2009
  
  abf845b9
- Update version in configure.in. · 72feecb4
  Alexander Nozdrin authored Sep 23, 2009
  
  72feecb4
- merge from 5.1 main · e03d7d4c
  Bjorn Munch authored Sep 23, 2009
  
  e03d7d4c
- Merge from mysql-trunk(-alik). · 665fda8b
  Alexander Nozdrin authored Sep 23, 2009
  
  665fda8b
- Merge from mysql-5.1. · 22ceefcb
  Alexander Nozdrin authored Sep 23, 2009
  
  22ceefcb
22 Sep, 2009 8 commits
- merge 5.1-mtr -> 5.1 -> trunk · c82ce462
  Bjorn Munch authored Sep 23, 2009
  
  c82ce462
- merge from 5.1 of merge from 5.1-mtr · 726df480
  Bjorn Munch authored Sep 22, 2009
  
  726df480
- Merge from mysql-next-mr. · 46a04938
  Alexander Nozdrin authored Sep 22, 2009
  
  46a04938
- Merge from mysql-trunk. · 88782134
  Alexander Nozdrin authored Sep 22, 2009
  
  88782134
- Merge from mysql-trunk. · d6022269
  Alexander Nozdrin authored Sep 22, 2009
  
  d6022269
- Update version. · 140d81e9
  Alexander Nozdrin authored Sep 22, 2009
  
  140d81e9
- merge from trunk (with trunk-mtr) · edea8102
  Bjorn Munch authored Sep 22, 2009
  
  edea8102
- merge from trunk-mtr · 8e59a23d
  Bjorn Munch authored Sep 22, 2009
  
  8e59a23d
21 Sep, 2009 3 commits
- Merge from mysql-5.1.39-release · 54cc3ecd
  Jonathan Perkin authored Sep 21, 2009
  
  54cc3ecd
- new merge from trunk · 59b1991b
  Bjorn Munch authored Sep 21, 2009
  
  59b1991b
- tiny suppression fix: avoid / · 52dc273d
  Bjorn Munch authored Sep 21, 2009
  
  52dc273d
19 Sep, 2009 4 commits
- Update default.experimental. · 1ff8e28a
  Alexander Nozdrin authored Sep 20, 2009
  
  1ff8e28a
- Merge from mysql-trunk. · fa96b368
  Alexander Nozdrin authored Sep 19, 2009
  
  fa96b368
- Mark some tests experimental. · e68f09ab
  Alexander Nozdrin authored Sep 19, 2009
  
  e68f09ab
- Merge from mysql-5.1. · eeec93f3
  Alexander Nozdrin authored Sep 19, 2009
  
  eeec93f3
18 Sep, 2009 7 commits
- Merge next-mr -> next-mr-bugfixing. · ab165ae6
  Alexander Nozdrin authored Sep 18, 2009
  
  ab165ae6
- Merge trunk -> trunk-bugfixing. · eeb31576
  Alexander Nozdrin authored Sep 18, 2009
  
  eeb31576
- Merge trunk -> next-mr. · f4a1177c
  Alexander Nozdrin authored Sep 18, 2009
  
  f4a1177c
- new merge from trunk · 9d9ee646
  Bjorn Munch authored Sep 18, 2009
  
  9d9ee646
- Revert InnoDB default values as of the InnoDB plugin 1.0.4. · 7de87424
  Alexander Nozdrin authored Sep 18, 2009
  
  7de87424
- Merge 5.1-bugteam -> trunk-alik (up to revno:3111). · bf995a09
  Alexander Nozdrin authored Sep 18, 2009
  
  bf995a09
- Null-merge 5.1-bugteam revno:3110 (fix for Bug#44030). · 8fc0757f
  Alexander Nozdrin authored Sep 18, 2009
```
After discussion with Satya this bug does not exist
in trunk.
```
  8fc0757f
17 Sep, 2009 1 commit
- Merge 5.1-bugteam -> trunk-alik. · 5b3f34f4
  Alexander Nozdrin authored Sep 17, 2009
  
  5b3f34f4