Commits · 2180197c9b0dbe815d89199a120156281d5a4605 · nexedi / MariaDB

15 Dec, 2005 10 commits
- Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release · 2180197c
  jonas@perch.ndb.mysql.com authored Dec 15, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  2180197c
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6dc0fbbe
  jonas@perch.ndb.mysql.com authored Dec 15, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  6dc0fbbe
- Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 · 47b576d6
  joerg@trift-lap.fambruehe authored Dec 15, 2005
```
into trift-lap.fambruehe:/MySQL/M51/work-5.1
```
  47b576d6
- Merge joerg@trift2:/M50/part3-kent-joerg · 0aaec937
  joerg@trift-lap.fambruehe authored Dec 15, 2005
```
into trift-lap.fambruehe:/MySQL/M51/merge-5.1
```
  0aaec937
- Merge mysql.com:/usr/local/mysql/mysql-5.0-merge · b2999dab
  knielsen@mysql.com authored Dec 15, 2005
```
into  mysql.com:/usr/local/mysql/mysql-5.1-new
```
  b2999dab
- Merge bk-internal:/home/bk/mysql-5.1-new · 153ec52f
  knielsen@mysql.com authored Dec 15, 2005
```
into  mysql.com:/usr/local/mysql/mysql-5.1-new
```
  153ec52f
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5f032c0e
  jonas@perch.ndb.mysql.com authored Dec 15, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  5f032c0e
- Makefile.am: · 9ca31046
  rparranovo@mysql.com authored Dec 15, 2005
```
  - libtool wants spaces on parameters for its command line options
```
  9ca31046
- Makefile.am: · efda29d3
  rparranovo@mysql.com authored Dec 15, 2005
```
  - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0
```
  efda29d3
- Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0a836ee8
  rparranovo@mysql.com authored Dec 15, 2005
```
into  mysql.com:/home/novo/MySQL/mysql-5.1
```
  0a836ee8
14 Dec, 2005 23 commits
- Merge joerg@trift2:/M50/part2-ramil · 7e36dc1c
  joerg@trift-lap.fambruehe authored Dec 14, 2005
```
into trift-lap.fambruehe:/MySQL/M51/merge-5.1
```
  7e36dc1c
- Merge trift-lap.fambruehe:/MySQL/M51/part1-kent-knielsen · 81df985a
  joerg@trift-lap.fambruehe authored Dec 14, 2005
```
into trift-lap.fambruehe:/MySQL/M51/merge-5.1
```
  81df985a
- Fix for bug #15623: Test case rpl000001 and rpl_error_ignored_table failure on MacOSX · 04cff0d0
  ramil@mysql.com authored Dec 14, 2005
```
and bug #15668: Test 'sp-error' crashes server on Mac OS X.
```
  04cff0d0
- Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable · 138ec21c
  mskold@mysql.com authored Dec 14, 2005
  
  138ec21c
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c6f658d0
  aivanov@mysql.com authored Dec 14, 2005
```
into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss28
```
  c6f658d0
- bug#15682 - ndb · 2059a6c1
  jonas@perch.ndb.mysql.com authored Dec 14, 2005
```
  incorrect handling of varchar in position/rnd_pos

  Commit for 5.0.17 release clone
```
  2059a6c1
- Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push · b5b0a3d6
  jonas@perch.ndb.mysql.com authored Dec 14, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  b5b0a3d6
- Merge mysql.com:/usr/local/mysql/mysql-mawk · bf5a72e3
  knielsen@mysql.com authored Dec 14, 2005
```
into  mysql.com:/usr/local/mysql/mysql-5.1-new
```
  bf5a72e3
- Merge bk-internal:/home/bk/mysql-5.1-new · 7454718c
  knielsen@mysql.com authored Dec 14, 2005
```
into  mysql.com:/usr/local/mysql/mysql-5.1-new
```
  7454718c
- BUG#15734: Fix undefined awk behaviour breaking compilation on Debian. · a3eea41f
  knielsen@mysql.com authored Dec 14, 2005
  
  a3eea41f
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · b7c11c87
  jonas@perch.ndb.mysql.com authored Dec 14, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
```
  b7c11c87
- Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · 6a028952
  jonas@perch.ndb.mysql.com authored Dec 14, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
```
  6a028952
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · b846c546
  jani@hundin.mysql.fi authored Dec 14, 2005
```
into  hundin.mysql.fi:/home/jani/mysql-5.1-new
```
  b846c546
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ae66c0b6
  jonas@perch.ndb.mysql.com authored Dec 14, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  ae66c0b6
- Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 · 4454e7a6
  jonas@perch.ndb.mysql.com authored Dec 14, 2005
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  4454e7a6
- bug#15682 - ndb - invalid handling of varchar in position/rnd_pos · 1864165f
  jonas@perch.ndb.mysql.com authored Dec 14, 2005
  
  1864165f
- Removed wrong merge from 5.0 - 5.1 · c9bad32a
  jani@a193-229-222-105.elisa-laajakaista.fi authored Dec 14, 2005
  
  c9bad32a
- Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 · 2ed8d82c
  jani@a193-229-222-105.elisa-laajakaista.fi authored Dec 14, 2005
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
```
  2ed8d82c
- Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1b846dc2
  knielsen@production.mysql.com authored Dec 14, 2005
```
into  production.mysql.com:/usersnfs/knielsen/mysql-5.0
```
  1b846dc2
- Patch for Bug#13640 · 834940e9
  jani@a193-229-222-105.elisa-laajakaista.fi authored Dec 14, 2005
  
  834940e9
- Disabled test. Fails in ps-protocol mode. · f845256f
  jani@a193-229-222-105.elisa-laajakaista.fi authored Dec 14, 2005
  
  f845256f
- Disabled archive db for Netware. · b7c52afb
  jani@a193-229-222-105.elisa-laajakaista.fi authored Dec 14, 2005
  
  b7c52afb
- Datadir variable should not be reset, if it was · 30692765
  jani@a193-229-222-105.elisa-laajakaista.fi authored Dec 14, 2005
```
set in this script.
```
  30692765
13 Dec, 2005 7 commits
- Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 · 37010dba
  jani@a193-229-222-105.elisa-laajakaista.fi authored Dec 14, 2005
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
```
  37010dba
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e8438b93
  jani@a193-229-222-105.elisa-laajakaista.fi authored Dec 14, 2005
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
```
  e8438b93
- Netware specific changes. · 96f8db34
  jani@a193-229-222-105.elisa-laajakaista.fi authored Dec 14, 2005
  
  96f8db34
- Fixed test case. · 4ac4020f
  jani@a193-229-222-105.elisa-laajakaista.fi authored Dec 14, 2005
  
  4ac4020f
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 · bb6c11bf
  jani@a193-229-222-105.elisa-laajakaista.fi authored Dec 14, 2005
```
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
```
  bb6c11bf
- Merge mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92 · 64580538
  aivanov@mysql.com authored Dec 13, 2005
```
into  mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss92
```
  64580538
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 012933ce
  evgen@moonbone.local authored Dec 13, 2005
```
into moonbone.local:/work/15268-bug-5.0-mysql
```
  012933ce