Commits · 224ce9080688b0e50aade1153fc44bb256f964a3 · Kirill Smelkov / mariadb

22 Jan, 2007 9 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 224ce908
  df@kahlann.erinye.com authored Jan 22, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
```
  224ce908
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · c5de0332
  df@kahlann.erinye.com authored Jan 22, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  c5de0332
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work-24780 · 96e9eee1
  df@kahlann.erinye.com authored Jan 22, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
```
  96e9eee1
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work1-testcases-20061 · 064b77a8
  df@kahlann.erinye.com authored Jan 22, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
```
  064b77a8
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work1-testcases-20061 · 9ed4299e
  df@kahlann.erinye.com authored Jan 22, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  9ed4299e
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780 · 1b8b33bf
  df@kahlann.erinye.com authored Jan 22, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  1b8b33bf
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780 · 5fe6fc1d
  df@kahlann.erinye.com authored Jan 22, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
  5fe6fc1d
- after-merge fix · c1243725
  df@kahlann.erinye.com authored Jan 22, 2007
  
  c1243725
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061 · 58bf0722
  df@kahlann.erinye.com authored Jan 22, 2007
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
  58bf0722
20 Jan, 2007 1 commit
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-topush · 02bed038
  cmiller@zippy.cornsilk.net authored Jan 20, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-topush
```
  02bed038
19 Jan, 2007 19 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
- Merge recycle.(none):/src/bug22807/my51-bug22807 · 0343fd80
  iggy@recycle.(none) authored Jan 19, 2007
```
into  recycle.(none):/src/mysql-5.1-maint
```
  0343fd80
- Merge recycle.(none):/src/bug22807/my50-bug22807 · d6d5195c
  iggy@recycle.(none) authored Jan 19, 2007
```
into  recycle.(none):/src/bug22807/my51-bug22807
```
  d6d5195c
- 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
- Add missing version delimiter. · 80e17985
  cmiller@zippy.cornsilk.net authored Jan 19, 2007
  
  80e17985
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · aaa7257b
  cmiller@zippy.cornsilk.net authored Jan 19, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  aaa7257b
- Rearrange disable_warnings to enclose the warning emitters properly. · 20faa77a
  cmiller@zippy.cornsilk.net authored Jan 19, 2007
  
  20faa77a
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint · e297ac66
  cmiller@zippy.cornsilk.net authored Jan 19, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  e297ac66
- 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 polly.local:/tmp/maint/bug23814/my51-bug23814 · 4b36a96e
  kaa@polly.local authored Jan 19, 2007
```
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
```
  4b36a96e
- Fix for the bug #23814 "mysqlimport crashes" · 71a292ca
  kaa@polly.local authored Jan 19, 2007
```
mysqlimport.c declared the opt_use_threads variable as my_bool, but the corresponding option was defined as GET_UINT. The problem only occured on architectures with strict alignment rules.
```
  71a292ca
- 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 11 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