Commits · 23db3ebf6f30f454a7621693ab5d5f63bd03edc3 · nexedi / MariaDB

02 Mar, 2007 18 commits
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 23db3ebf
  unknown authored Mar 02, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  23db3ebf
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 94eb5f71
  unknown authored Mar 02, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
```
  94eb5f71
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 · 6389cd12
  unknown authored Mar 02, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
```
  6389cd12
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.0 · 36d9dea1
  unknown authored Mar 02, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-4.0
```
  36d9dea1
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build · c554c2bf
  unknown authored Mar 02, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  c554c2bf
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 3ae2a441
  unknown authored Mar 02, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  3ae2a441
- Merge trift2.:/MySQL/M50/manpages-5.0 · 0336a967
  unknown authored Mar 02, 2007
```
into  trift2.:/MySQL/M51/manpages-5.1


support-files/mysql.spec.sh:
  Manual merge, adapting to additional "embedded" files in 5.1
```
  0336a967
- Merge trift2.:/MySQL/M41/manpages-4.1 · b2c6d33e
  unknown authored Mar 02, 2007
```
into  trift2.:/MySQL/M50/manpages-5.0


support-files/mysql.spec.sh:
  Manual merge, adapting to expanded 5.0 filelist.
```
  b2c6d33e
- Merge trift2.:/MySQL/M40/manpages-4.0 · a74c8eaf
  unknown authored Mar 02, 2007
```
into  trift2.:/MySQL/M41/manpages-4.1


support-files/mysql.spec.sh:
  SCCS merged
```
  a74c8eaf
- More man pages for the RPMs. · 56eae45c
  unknown authored Mar 02, 2007
```
support-files/mysql.spec.sh:
  More man pages.
```
  56eae45c
- Another man page in the RPMs. · b73f17fb
  unknown authored Mar 02, 2007
```
support-files/mysql.spec.sh:
  Another man page.
```
  b73f17fb
- Merge trift2.:/MySQL/M50/manpages-5.0 · 614a5551
  unknown authored Mar 02, 2007
```
into  trift2.:/MySQL/M51/manpages-5.1


support-files/mysql.spec.sh:
  Auto merged
```
  614a5551
- Merge trift2.:/MySQL/M41/manpages-4.1 · 35c841fb
  unknown authored Mar 02, 2007
```
into  trift2.:/MySQL/M50/manpages-5.0


support-files/mysql.spec.sh:
  Null-merge, the equivalent fix here is a change of its own.
```
  35c841fb
- Merge trift2.:/MySQL/M40/manpages-4.0 · 00179853
  unknown authored Mar 02, 2007
```
into  trift2.:/MySQL/M41/manpages-4.1


support-files/mysql.spec.sh:
  Null-merge, the equivalent fix here is a change of its own (NDB).
```
  00179853
- Add man pages for NDB to the RPMs. · ceab5d2f
  unknown authored Mar 02, 2007
```
support-files/mysql.spec.sh:
  Add man pages for NDB.
```
  ceab5d2f
- Add the man pages for NDB to the RPMs. · 9e290476
  unknown authored Mar 02, 2007
```
support-files/mysql.spec.sh:
  Add the man pages for NDB.
```
  9e290476
- Add the man pages for NDB to the RPMs. · 622533fa
  unknown authored Mar 02, 2007
```
support-files/mysql.spec.sh:
  Add the man pages for NDB.
```
  622533fa
- Add missing man pages to the RPMs. · d2636932
  unknown authored Mar 02, 2007
```
support-files/mysql.spec.sh:
  Add missing man pages.
```
  d2636932
01 Mar, 2007 5 commits

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 7124d328
unknown authored Mar 02, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
7124d328

mysql.sln: · 10f632a1

unknown authored Mar 02, 2007

  Correction of embedded build types


VC++Files/mysql.sln:
  Correction of embedded build types

10f632a1

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · a31c7d39
unknown authored Mar 02, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
a31c7d39

mysql.sln: · fe371125

unknown authored Mar 01, 2007

  Disabled build of all embedded server libraries, "libmysqld.ldd"
  "mysqldemb.lib" and "mysqlserver.lib"


VC++Files/mysql.sln:
  Disabled build of all embedded server libraries, "libmysqld.ldd"
  "mysqldemb.lib" and "mysqlserver.lib"

fe371125

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 462e3982
unknown authored Mar 01, 2007
```
into  trift2.:/MySQL/M51/push-5.1


scripts/make_binary_distribution.sh:
  Auto merged
```
462e3982

28 Feb, 2007 17 commits
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · f835ac88
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


Docs/Makefile.am:
  Auto merged
```
  f835ac88
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 858ea1bf
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


Docs/Makefile.am:
  Auto merged
```
  858ea1bf
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 · ff71e731
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
```
  ff71e731
- Makefile.am: · 48c3d361
  unknown authored Feb 28, 2007
```
  EXCEPTIONS-CLIENT is now static part of repository


Docs/Makefile.am:
  EXCEPTIONS-CLIENT is now static part of repository
```
  48c3d361
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · e0ca832b
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


Docs/Makefile.am:
  Auto merged
```
  e0ca832b
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · f2bd13f6
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


Docs/Makefile.am:
  Auto merged
```
  f2bd13f6
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 · 548d23ac
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build


Docs/Makefile.am:
  SCCS merged
```
  548d23ac
- Makefile.am: · 5a232872
  unknown authored Feb 28, 2007
```
  EXCEPTIONS-CLIENT is now static part of repository
EXCEPTIONS-CLIENT:
  BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT


EXCEPTIONS-CLIENT:
  BitKeeper file /home/kent/bk/tmp/mysql-4.0/EXCEPTIONS-CLIENT
Docs/Makefile.am:
  EXCEPTIONS-CLIENT is now static part of repository
```
  5a232872
- Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · f629d608
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


configure.in:
  SCCS merged
```
  f629d608
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · c96275aa
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
  c96275aa
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build · 77e5eb3c
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build


configure.in:
  SCCS merged
```
  77e5eb3c
- Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 · 7d1ff29c
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
```
  7d1ff29c
- Merge trift2.:/MySQL/M50/upward-5.0 · 83f36c15
  unknown authored Feb 28, 2007
```
into  trift2.:/MySQL/M51/merge-5.1


scripts/make_binary_distribution.sh:
  Null merge, it is a backport from 5.1 to 5.0 anyway.
```
  83f36c15
- added initialization of 'cmp_type' variable(to remove compiler warning) · 793a137d
  unknown authored Feb 28, 2007
  
  793a137d
- Merge trift2.:/MySQL/M50/mysql-5.0 · 912a9076
  unknown authored Feb 28, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  912a9076
- A binary package should also contain the "mysqld-debug" server (backport from 5.1). · e1426fee
  unknown authored Feb 28, 2007
  
  e1426fee
- Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 53c5511a
  unknown authored Feb 28, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  53c5511a