Commits · 4dbfac2a5c791174297381efc9bd5c9412a4a22a · Kirill Smelkov / mariadb

19 Jan, 2007 7 commits
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint · 4dbfac2a
  msvensson@pilot.mysql.com authored Jan 19, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
```
  4dbfac2a
- Merge bk-internal:/home/bk/mysql-5.0-maint · b1a9115d
  msvensson@pilot.mysql.com authored Jan 19, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
```
  b1a9115d
- Merge bk-internal:/home/bk/mysql-5.1-maint · f22549a8
  msvensson@pilot.mysql.com authored Jan 19, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
```
  f22549a8
- Bug #15518 Reusing a stmt that has failed during prepare does not clear error · 2c60829f
  msvensson@pilot.mysql.com authored Jan 19, 2007
```
 - Additional patch removing check for mysql_errno on already closed
   mysql1
```
  2c60829f
- after merge fix. · ad425304
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Jan 19, 2007
  
  ad425304
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 86322e26
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Jan 19, 2007
```
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
```
  86322e26
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 1b488c7f
  ramil/ram@myoffice.izhnet.ru authored Jan 19, 2007
```
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
```
  1b488c7f
18 Jan, 2007 33 commits
- Fix merge problem. · d0a2f4d9
  cmiller@zippy.cornsilk.net authored Jan 18, 2007
  
  d0a2f4d9
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50 · f4354a87
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
```
  f4354a87
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41 · f135f34e
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
```
  f135f34e
- ndb_types.test: sleep a bit longer, to ensure that timestamp > @now · f5aab8b2
  tsmith@siva.hindu.god authored Jan 18, 2007
  
  f5aab8b2
- Makefile.am: Fix previous bad merge. Re-enable the test-ps target. · dac5bb38
  tsmith@siva.hindu.god authored Jan 18, 2007
  
  dac5bb38
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50 · 1d729942
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
```
  1d729942
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41 · f3d321a2
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
```
  f3d321a2
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40 · 58174654
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
```
  58174654
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 1fbf01ba
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
```
  1fbf01ba
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 02ddf3d0
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
```
  02ddf3d0
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 · 6b729ff2
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
```
  6b729ff2
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50 · 244b2004
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
```
  244b2004
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 · 6fd02a43
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
```
  6fd02a43
- Merge recycle.(none):/src/bug22807/my50-bug22807 · 294af0a4
  iggy@recycle.(none) authored Jan 18, 2007
```
into  recycle.(none):/src/mysql-5.0-maint
```
  294af0a4
- Merge recycle.(none):/src/bug22807/my51-bug22807 · 1b32febd
  iggy@recycle.(none) authored Jan 18, 2007
```
into  recycle.(none):/src/mysql-5.1-maint
```
  1b32febd
- Merge recycle.(none):/src/bug22807/my50-bug22807 · e6d1953c
  iggy@recycle.(none) authored Jan 18, 2007
```
into  recycle.(none):/src/bug22807/my51-bug22807
```
  e6d1953c
- Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces · ef5f757a
  iggy@recycle.(none) authored Jan 18, 2007
```
- Create space safe strings for system() calls in mysql_upgrade.exe
```
  ef5f757a
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · eec44018
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
```
  eec44018
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50 · fcd5f26d
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
```
  fcd5f26d
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 · d4aa9f0c
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
```
  d4aa9f0c
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · 2dc96063
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
```
  2dc96063
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · a5f153ef
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
```
  a5f153ef
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · e39a4e60
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
```
  e39a4e60
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 4b384061
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
```
  4b384061
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50 · 94f7990e
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
```
  94f7990e
- Raise version number after cloning 4.0.29 · c3ab6de2
  joerg/mysqldev@mysql.com/production.mysql.com authored Jan 18, 2007
  
  c3ab6de2
- Bug#25408 5.1 Can't compile on Windows · e0823826
  iggy@alf. authored Jan 18, 2007
```
- DBUG_ENTER must be called before assignment on Windows and Netware.
```
  e0823826
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51 · cc7afe24
  tsmith@siva.hindu.god authored Jan 18, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
```
  cc7afe24
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 6eba6775
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Jan 18, 2007
```
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
```
  6eba6775
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 3760672e
  ramil/ram@myoffice.izhnet.ru authored Jan 18, 2007
```
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
```
  3760672e
- Merge mysql.com:/usr/home/ram/work/bug22533/my50-bug22533 · 9d86d7e9
  ramil/ram@myoffice.izhnet.ru authored Jan 18, 2007
```
into  mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
```
  9d86d7e9
- after merge fix. · c57442d6
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Jan 18, 2007
  
  c57442d6
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1 · fb0be729
  lars/lthalmann@dl145h.mysql.com authored Jan 18, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
```
  fb0be729