Commits · 6cb4282fd85ba917b2f262dff0f92a1ca8fa33a6 · Kirill Smelkov / mariadb

22 Jan, 2007 4 commits
- Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41 · 6cb4282f
  tsmith@siva.hindu.god authored Jan 21, 2007
```
into  siva.hindu.god:/home/tsmith/m/inno/jan20/50
```
  6cb4282f
- Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41 · 70119a16
  tsmith@siva.hindu.god authored Jan 21, 2007
```
into  siva.hindu.god:/home/tsmith/m/inno/jan20/50
```
  70119a16
- Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots · b448b622
  tsmith@siva.hindu.god authored Jan 21, 2007
```
Fixes:
- Bug #24299: 
- Bug #25596: 
```
  b448b622
- Applied innodb-5.0-ss1230 snapshot · 7ce6170c
  tsmith@siva.hindu.god authored Jan 21, 2007
```
Fixes:
- Bug #25596: 
```
  7ce6170c
19 Jan, 2007 10 commits
- Merge recycle.(none):/src/bug22807/my50-bug22807 · 205f7a05
  iggy@recycle.(none) authored Jan 19, 2007
```
into  recycle.(none):/src/mysql-5.0-maint
```
  205f7a05
- Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces · d3e6cb6b
  iggy@recycle.(none) authored Jan 19, 2007
```
- Corrected compiler warnings and performance problems with new 
dynstr_append_os_quoted function.
```
  d3e6cb6b
- Rearrange disable_warnings to enclose the warning emitters properly. · 20faa77a
  cmiller@zippy.cornsilk.net authored Jan 19, 2007
  
  20faa77a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 85eb07ff
  cmiller@zippy.cornsilk.net authored Jan 19, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  85eb07ff
- The rpl tree added a test case, and another source added a warning, · a8ff939d
  cmiller@zippy.cornsilk.net authored Jan 19, 2007
```
and combined, they add a platform-specific warning.  The warnings 
are not the goal of the test, in any case.
```
  a8ff939d
- 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
- 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. · 6e915574
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Jan 19, 2007
  
  6e915574
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · ce855aba
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Jan 19, 2007
```
into  mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
```
  ce855aba
- 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
18 Jan, 2007 22 commits
- 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/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.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/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
- 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/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.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
- Raise version number after cloning 4.0.29 · c3ab6de2
  joerg/mysqldev@mysql.com/production.mysql.com authored Jan 18, 2007
  
  c3ab6de2
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint · c91d648b
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Jan 18, 2007
```
into  mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
```
  c91d648b
- 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
- after merge fix. · c57442d6
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Jan 18, 2007
  
  c57442d6
- after merge fix. · 5c42e683
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Jan 18, 2007
  
  5c42e683
- Merge mysql.com:/usr/home/ram/work/bug22533/my41-bug22533 · e8968822
  ramil/ram@mysql.com/myoffice.izhnet.ru authored Jan 18, 2007
```
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
```
  e8968822
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41 · 2ae081e0
  tsmith@siva.hindu.god authored Jan 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
```
  2ae081e0
17 Jan, 2007 4 commits
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41 · 8f5fdfe7
  tsmith@siva.hindu.god authored Jan 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
```
  8f5fdfe7
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · d6d7385a
  tsmith@siva.hindu.god authored Jan 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
```
  d6d7385a
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · 018acedb
  tsmith@siva.hindu.god authored Jan 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
```
  018acedb
- Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/40 · fa927d7e
  tsmith@siva.hindu.god authored Jan 17, 2007
```
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
```
  fa927d7e