Commits · f135f34ebc0ac2b857616c4546ba28d41a6855eb · Kirill Smelkov / mariadb

18 Jan, 2007 17 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 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 21 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
- Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge · 044bb384
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Jan 17, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
  044bb384
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721 · c9a0cccc
  cmiller@zippy.cornsilk.net authored Jan 17, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
```
  c9a0cccc
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · b25079d6
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Jan 17, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
```
  b25079d6
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721 · 940e7227
  cmiller@zippy.cornsilk.net authored Jan 17, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  940e7227
- Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-4.1-rpl · bbaf3275
  lars/lthalmann@mysql.com/dl145j.mysql.com authored Jan 17, 2007
```
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge
```
  bbaf3275
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my41-bug23721 · 8a746fc0
  cmiller@zippy.cornsilk.net authored Jan 17, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug23721/my50-bug23721
```
  8a746fc0
- Bug#23721: compile fails: check-cpu mishandles cpu flags with \ · 332f9ff8
  cmiller@zippy.cornsilk.net authored Jan 17, 2007
```
	hyphen in it (like ds-cpl).

convert illegal chars in cpu flags to '_' for variable assignment
```
  332f9ff8
- Disable symlinks under valgrind builds (again), with a comment. · 15c9d8a6
  kostja@bodhi.local authored Jan 17, 2007
  
  15c9d8a6
- Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · a9590803
  kostja@bodhi.local authored Jan 17, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-debug-max
```
  a9590803
- Merge 192.168.0.10:mysql/mysql-5.0-maint · d18e9892
  msvensson@pilot.mysql.com authored Jan 17, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
```
  d18e9892
- Fix a failure of lowercase_tables2 test on powermacg5, introduced · 6399db74
  kostja@bodhi.local authored Jan 17, 2007
```
by the patch for Bug#4968
```
  6399db74
- Replace the --exec in a while loop that causes 3400 executions of cygwin/bash on · c4a86761
  msvensson@neptunus.(none) authored Jan 17, 2007
```
windows with a small perl script that does exactly the same. 
```
  c4a86761
- Fix a ps.test failure in 5.0-runtime tree. · 17543881
  kostja@bodhi.local authored Jan 17, 2007
  
  17543881
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint · 3b869591
  msvensson@pilot.mysql.com authored Jan 17, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
```
  3b869591
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0 · 51292deb
  msvensson@pilot.mysql.com authored Jan 17, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
```
  51292deb
- Bug#25505 Myisam library compiler error on Windows · 29be5ce8
  msvensson@pilot.mysql.com authored Jan 17, 2007
  
  29be5ce8
- Merge pilot.mysql.com:/home/msvensson/mysql/mysql-4.1 · 8154355a
  msvensson@pilot.mysql.com authored Jan 17, 2007
```
into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
```
  8154355a
16 Jan, 2007 2 commits
- Merge bodhi.local:/opt/local/work/mysql-4.1-runtime · 76dfe0bc
  kostja@bodhi.local authored Jan 16, 2007
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  76dfe0bc
- A fix for the broken 4.1-runtime tree. · 51a2f515
  kostja@bodhi.local authored Jan 16, 2007
  
  51a2f515