Commits · 87349f0d81e815e06bd155f311b5e02ca05bc795 · nexedi / MariaDB

10 Feb, 2005 13 commits
- Merge mysql.com:/home/jonas/src/mysql-5.0 · 87349f0d
  joreland@mysql.com authored Feb 10, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  87349f0d
- merge · ce08a8ab
  joreland@mysql.com authored Feb 10, 2005
  
  ce08a8ab
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · e4e89f8c
  joreland@mysql.com authored Feb 10, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
  e4e89f8c
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a1725758
  msvensson@neptunus.homeip.net authored Feb 10, 2005
```
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
```
  a1725758
- Things missing in last changset · ccb2f338
  monty@mysql.com authored Feb 10, 2005
```
After merge fixes
Don't give duplicate warnings for some ::store() functions
```
  ccb2f338
- Change script to avoiud multiple --debug flags when starting master servers · 8fb1f824
  msvensson@neptunus.homeip.net authored Feb 10, 2005
  
  8fb1f824
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b9e502a9
  monty@mysql.com authored Feb 10, 2005
```
into mysql.com:/home/my/mysql-5.0
```
  b9e502a9
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 03baacaf
  joreland@mysql.com authored Feb 10, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
  03baacaf
- Merge mysql.com:/home/jonas/src/mysql-4.1-rel · 8bc5e21e
  joreland@mysql.com authored Feb 10, 2005
```
into mysql.com:/home/jonas/src/mysql-4.1
```
  8bc5e21e
- Added missing #ifdef HAVE_INNOBASE_DB:s in sql_parse.cc. · 51296b53
  pem@mysql.comhem.se authored Feb 10, 2005
  
  51296b53
- ndb - Reenable old benchmark · 216c44e4
  joreland@mysql.com authored Feb 10, 2005
  
  216c44e4
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5b1572e7
  joreland@mysql.com authored Feb 10, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
  5b1572e7
- Merge with 4.1 · a1a39fab
  monty@mysql.com authored Feb 10, 2005
  
  a1a39fab
09 Feb, 2005 27 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 52396051
  monty@mysql.com authored Feb 09, 2005
```
into mysql.com:/home/my/mysql-5.0
```
  52396051
- cleaned up mysql installation code for windows. · b2f4af00
  monty@mysql.com authored Feb 09, 2005
```
This removes a (small) memory leak.
```
  b2f4af00
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 5af87424
  joreland@mysql.com authored Feb 09, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  5af87424
- Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 · 70797f57
  bell@sanja.is.com.ua authored Feb 09, 2005
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
```
  70797f57
- reverted patch for BUG#7351 (because of performance ussie) · 90c00242
  bell@sanja.is.com.ua authored Feb 09, 2005
  
  90c00242
- Fix bad 4.1->5.0 merge of Bug#6273 (mysql_config --libs when using bundled · c55a2de5
  konstantin@mysql.com authored Feb 09, 2005
```
zlib)
```
  c55a2de5
- ndb_port_base is obsolete with WL#2278 · 264bac2f
  tomas@poseidon.ndb.mysql.com authored Feb 09, 2005
  
  264bac2f
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · ab5aed60
  monty@mysql.com authored Feb 09, 2005
```
into mysql.com:/home/my/mysql-4.1
```
  ab5aed60
- Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 · afa2a462
  lenz@mysql.com authored Feb 09, 2005
```
into mysql.com:/space/my/mysql-4.1-merge
```
  afa2a462
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 0c096d42
  tomas@poseidon.ndb.mysql.com authored Feb 09, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
```
  0c096d42
- Merge mysql.com:/space/my/mysql-4.1-merge · 420d2915
  lenz@mysql.com authored Feb 09, 2005
```
into mysql.com:/space/my/mysql-5.0
```
  420d2915
- - make sure to include the embedded test results in the source distribution · a0089319
  lenz@mysql.com authored Feb 09, 2005
  
  a0089319
- - added copyright header on top of the fill_help_tables.sql file (BUG#5772) · 8999d5ab
  lenz@mysql.com authored Feb 09, 2005
```
- updated mysql-copyright-2 to properly convert this new header from GPL to commercial for the
  commercial distribution
```
  8999d5ab
- Merge mysql.com:/home/jonas/src/mysql-5.0 · 80b0974b
  joreland@mysql.com authored Feb 09, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  80b0974b
- #ifdef innodb specific code · 0e07d4b5
  joreland@mysql.com authored Feb 09, 2005
```
(for those who compile --without-innodb :-)
```
  0e07d4b5
- Merge · 9a564f83
  kent@mysql.com authored Feb 09, 2005
  
  9a564f83
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b8490b55
  msvensson@neptunus.homeip.net authored Feb 09, 2005
```
into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0
```
  b8490b55
- Fix so that master and master1 does not write to same .trace file · 0ed97187
  msvensson@neptunus.homeip.net authored Feb 09, 2005
  
  0ed97187
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 4f9b9703
  tomas@poseidon.ndb.mysql.com authored Feb 09, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-wl2278
```
  4f9b9703
- recommit fix as 4.1->5.0 is currently impossible and fix is _really_ useful · 95da4585
  joreland@mysql.com authored Feb 09, 2005
  
  95da4585
- Merge vkishkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 00cc3cbf
  wax@mysql.com authored Feb 09, 2005
```
into mysql.com:/home/wax/mysql/mysql-5.0
```
  00cc3cbf
- Merge mysql.com:/home/jonas/src/mysql-5.0 · 74d10e48
  joreland@mysql.com authored Feb 09, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  74d10e48
- removed extra comma at end of enum. cause compile error with gcc-3.4.3 · a47260fa
  joreland@mysql.com authored Feb 09, 2005
  
  a47260fa
- Merge · 3e708a27
  serg@serg.mylan authored Feb 09, 2005
  
  3e708a27
- gone: · 184410c4
  serg@serg.mylan authored Feb 09, 2005
```
  merged
  auto-union
```
  184410c4
- Merge mysql.com:/home/wax/mysql/mysql-5.0 · bc9e89a8
  wax@mysql.com authored Feb 09, 2005
```
into mysql.com:/home/wax/mysql/mysql-5.0test
```
  bc9e89a8
- merge · a0507f98
  wax@kishkin.ru authored Feb 09, 2005
  
  a0507f98