Commits · 2e73a53e033741b09a652646d9cfa0e76c33e6a1 · nexedi / MariaDB

12 Apr, 2007 2 commits
- Merge trift2.:/MySQL/M50/push-5.0 · 2e73a53e
  unknown authored Apr 12, 2007
```
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
```
  2e73a53e
- Merge trift2.:/MySQL/M41/push-4.1 · 795d8583
  unknown authored Apr 12, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  795d8583
11 Apr, 2007 9 commits
- don't copy pdb files from the release target output folder, since this target does not build them · 056e6ba4
  unknown authored Apr 11, 2007
```
scripts/make_win_bin_dist:
  don't try to copy the pdb files from the release output folder
```
  056e6ba4
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 4c8decfb
  unknown authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  4c8decfb
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · e4668eeb
  unknown authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  e4668eeb
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 · c6ada65a
  unknown authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


configure.in:
  Auto merged
```
  c6ada65a
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-25601 · 44adef74
  unknown authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  44adef74
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-25601 · d2880dbe
  unknown authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  d2880dbe
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 · 2b685e48
  unknown authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work


configure.in:
  Auto merged
```
  2b685e48
- make configure handle service pack version strings · f89df01c
  unknown authored Apr 11, 2007
```
configure.in:
  recognize service pack version strings
```
  f89df01c
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · bbf07e14
  unknown authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  bbf07e14
10 Apr, 2007 7 commits

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · cb8f4d40
unknown authored Apr 11, 2007
```
into  mysql.com:/home/kent/bk/tmp3/mysql-4.1-build
```
cb8f4d40
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 598c0526
unknown authored Apr 11, 2007
```
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
```
598c0526
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · 887cde75
unknown authored Apr 11, 2007
```
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
```
887cde75

Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build · 010d81af

unknown authored Apr 11, 2007

into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build


config/ac-macros/zlib.m4:
  Auto merged
mysys/my_memmem.c:
  Auto merged
zlib/Makefile.am:
  Auto merged

010d81af

my_memmem.c: · bb4987f1

unknown authored Apr 11, 2007

  Back port of include change and copyright from 5.1
Makefile.am, zlib.m4:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory


zlib/Makefile.am:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory
config/ac-macros/zlib.m4:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory
mysys/my_memmem.c:
  Back port of include change and copyright from 5.1

bb4987f1

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-release · b4a35ca5

unknown authored Apr 10, 2007

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work


CMakeLists.txt:
  Auto merged
mysql-test/r/mysqlbinlog.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_bin_dist:
  Auto merged
sql/set_var.cc:
  Auto merged
support-files/mysql.spec.sh:
  merge fix

b4a35ca5

add a manual page back · d6a3989a
unknown authored Apr 10, 2007
```
support-files/mysql.spec.sh:
  add mysql_install_db.1 back
```
d6a3989a

09 Apr, 2007 5 commits

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 37feda25

unknown authored Apr 09, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


mysql-test/t/loaddata.test:
  Auto merged
sql/sql_load.cc:
  Auto merged
mysql-test/r/loaddata.result:
  SCCS merged

37feda25

Merge bk@192.168.21.1:mysql-5.0-opt · d2667d1a
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
d2667d1a

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 7f993fa6

unknown authored Apr 09, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

7f993fa6

Merge bk@192.168.21.1:mysql-5.1 · 43d17730
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/sql_table.cc:
  Auto merged
```
43d17730
Merge bk@192.168.21.1:mysql-5.0 · 6d9a7969
unknown authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/sql_table.cc:
  Auto merged
```
6d9a7969

08 Apr, 2007 2 commits

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · fde3e9d4

unknown authored Apr 08, 2007

into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

fde3e9d4

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · ddaeead8

unknown authored Apr 08, 2007

into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines


sql/item_func.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

ddaeead8

07 Apr, 2007 15 commits

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 1f8dbdaf
unknown authored Apr 07, 2007
```
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql


sql/sql_load.cc:
  Auto merged
```
1f8dbdaf
merging fix · a1576f92
unknown authored Apr 08, 2007
```
mysql-test/r/windows.result:
  result fixed
```
a1576f92
Merge trift2.:/MySQL/M41/mysql-4.1 · bd44cc11
unknown authored Apr 07, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
bd44cc11
Merge trift2.:/MySQL/M50/mysql-5.0 · 38a12cc8
unknown authored Apr 07, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
38a12cc8
Merge trift2.:/MySQL/M51/mysql-5.1 · b77c664e
unknown authored Apr 07, 2007
```
into  trift2.:/MySQL/M51/push-5.1


BitKeeper/etc/ignore:
  auto-union
```
b77c664e

after-merging fix · 3f0c44c6

unknown authored Apr 07, 2007


mysql-test/r/events_trans.result:
  result fixed
mysql-test/r/windows.result:
  merging fix
mysql-test/t/events_trans.test:
  moved to events_trans_notembedded.test
mysql-test/r/events_trans_notembedded.result:
  New BitKeeper file ``mysql-test/r/events_trans_notembedded.result''
mysql-test/t/events_trans_notembedded.test:
  New BitKeeper file ``mysql-test/t/events_trans_notembedded.test''

3f0c44c6

Merge mysql.com:/home/hf/work/26074/my51-26074 · 156735bd
unknown authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
156735bd

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · a748949d

unknown authored Apr 07, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/field.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

a748949d

Merge bk@192.168.21.1:mysql-5.1-opt · 023ae2a0

unknown authored Apr 07, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


client/mysqldump.c:
  Auto merged
mysql-test/r/rpl_packet.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/rpl_packet.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
storage/innobase/handler/ha_innodb.cc:
  Auto merged
mysql-test/r/create.result:
  SCCS merged
mysql-test/t/create.test:
  merging
mysql-test/t/disabled.def:
  merging
sql/events.cc:
  merging
sql/sql_parse.cc:
  SCCS merged

023ae2a0

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · be3bc128
unknown authored Apr 07, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
```
be3bc128
Merge mysql.com:/d2/hf/mrg/mysql-4.1-opt · a978d84c
unknown authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
a978d84c

Merge bk@192.168.21.1:mysql-5.0 · b3f9c888

unknown authored Apr 07, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.0-opt


sql/field.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

b3f9c888

Merge bk@192.168.21.1:mysql-4.1 · 2911bcd8
unknown authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-4.1-opt
```
2911bcd8
test temporarily disabled · 79512192
unknown authored Apr 07, 2007

79512192
Merge mysql.com:/tmp/mysql-5.0-build · fb27844b
unknown authored Apr 07, 2007
```
into  mysql.com:/tmp/mysql-5.1-build
```
fb27844b