Commits · 2b2ef99ebf63634d6da81f27aa2ee94e09e5b197 · Kirill Smelkov / mariadb

23 Sep, 2009 14 commits
- merge · 2b2ef99e
  Vladislav Vaintroub authored Sep 23, 2009
  
  2b2ef99e
- merge · 7ddb103b
  Vladislav Vaintroub authored Sep 23, 2009
  
  7ddb103b
- Merge from mysql-trunk. · 4e83ce7c
  Alexander Nozdrin authored Sep 23, 2009
  
  4e83ce7c
- Update disabled.def files. · 41a8a638
  Alexander Nozdrin authored Sep 23, 2009
  
  41a8a638
- Update default.conf. · 7947948c
  Alexander Nozdrin authored Sep 23, 2009
  
  7947948c
- Merge from mysql-next-mr. · 8b936166
  Alexander Nozdrin authored Sep 23, 2009
  
  8b936166
- Merge from mysql-trunk. · 44927973
  Alexander Nozdrin authored Sep 23, 2009
  
  44927973
- Update default.conf. · 7cd113e5
  Alexander Nozdrin authored Sep 23, 2009
  
  7cd113e5
- Update default.conf. · 5a361c26
  Alexander Nozdrin authored Sep 23, 2009
  
  5a361c26
- Merge from mysql-trunk. · b42b4614
  Alexander Nozdrin authored Sep 23, 2009
  
  b42b4614
- Merge from mysql-trunk-alik. · 5f6299cf
  Alexander Nozdrin authored Sep 23, 2009
  
  5f6299cf
- Update version in configure.in. · 60781e32
  Alexander Nozdrin authored Sep 23, 2009
  
  60781e32
- Merge from mysql-trunk(-alik). · aaae814e
  Alexander Nozdrin authored Sep 23, 2009
  
  aaae814e
- Merge from mysql-5.1. · 68a9b7db
  Alexander Nozdrin authored Sep 23, 2009
  
  68a9b7db
22 Sep, 2009 8 commits
- merge 5.1-mtr -> 5.1 -> trunk · 60bd6508
  Bjorn Munch authored Sep 23, 2009
  
  60bd6508
- merge from 5.1 of merge from 5.1-mtr · 868d45c8
  Bjorn Munch authored Sep 22, 2009
  
  868d45c8
- Merge from mysql-next-mr. · 9e9b8f32
  Alexander Nozdrin authored Sep 22, 2009
  
  9e9b8f32
- Merge from mysql-trunk. · addd7298
  Alexander Nozdrin authored Sep 22, 2009
  
  addd7298
- Merge from mysql-trunk. · 3b494279
  Alexander Nozdrin authored Sep 22, 2009
  
  3b494279
- Update version. · dcf935a1
  Alexander Nozdrin authored Sep 22, 2009
  
  dcf935a1
- merge from trunk (with trunk-mtr) · 8ff5366c
  Bjorn Munch authored Sep 22, 2009
  
  8ff5366c
- merge from trunk-mtr · 3df9e735
  Bjorn Munch authored Sep 22, 2009
  
  3df9e735
21 Sep, 2009 3 commits
- Merge from mysql-5.1.39-release · e465d113
  Jonathan Perkin authored Sep 21, 2009
  
  e465d113
- new merge from trunk · bb181d25
  Bjorn Munch authored Sep 21, 2009
  
  bb181d25
- tiny suppression fix: avoid / · 4a75d269
  Bjorn Munch authored Sep 21, 2009
  
  4a75d269
19 Sep, 2009 4 commits
- Update default.experimental. · 18f7dd0f
  Alexander Nozdrin authored Sep 20, 2009
  
  18f7dd0f
- Merge from mysql-trunk. · 4d3c995e
  Alexander Nozdrin authored Sep 19, 2009
  
  4d3c995e
- Mark some tests experimental. · 9d8c0238
  Alexander Nozdrin authored Sep 19, 2009
  
  9d8c0238
- Merge from mysql-5.1. · ede2edd1
  Alexander Nozdrin authored Sep 19, 2009
  
  ede2edd1
18 Sep, 2009 7 commits
- Merge next-mr -> next-mr-bugfixing. · 159e42fc
  Alexander Nozdrin authored Sep 18, 2009
  
  159e42fc
- Merge trunk -> trunk-bugfixing. · 23364d69
  Alexander Nozdrin authored Sep 18, 2009
  
  23364d69
- Merge trunk -> next-mr. · 387952e0
  Alexander Nozdrin authored Sep 18, 2009
  
  387952e0
- new merge from trunk · f89b36fc
  Bjorn Munch authored Sep 18, 2009
  
  f89b36fc
- Revert InnoDB default values as of the InnoDB plugin 1.0.4. · e60ff2b6
  Alexander Nozdrin authored Sep 18, 2009
  
  e60ff2b6
- Merge 5.1-bugteam -> trunk-alik (up to revno:3111). · adb4d9c4
  Alexander Nozdrin authored Sep 18, 2009
  
  adb4d9c4
- Null-merge 5.1-bugteam revno:3110 (fix for Bug#44030). · d3502127
  Alexander Nozdrin authored Sep 18, 2009
```
After discussion with Satya this bug does not exist
in trunk.
```
  d3502127
17 Sep, 2009 4 commits
- Merge 5.1-bugteam -> trunk-alik. · d35001e7
  Alexander Nozdrin authored Sep 17, 2009
  
  d35001e7
- Merge mysql-trunk-build -> mysql-next-mr-alik. · 1ab38908
  Alexander Nozdrin authored Sep 17, 2009
  
  1ab38908
- Merge "trunk-build" (including 5.4.2-beta) and "trunk". · d0408492
  Joerg Bruehe authored Sep 17, 2009
  
  d0408492
- Bug#42364 SHOW ERRORS returns empty resultset after dropping non existent table · 2535ede7
  Sergey Glukhov authored Sep 17, 2009
```
additional backport of of bug43138 fix


mysql-test/t/myisam-system.test:
  additional backport of of bug43138 fix
sql/sql_db.cc:
  additional backport of of bug43138 fix
```
  2535ede7