Commits · c5c1f780e137d80c0df9c2fdf9cca32cf069ffe4 · nexedi / MariaDB

14 Nov, 2006 3 commits

Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 · c5c1f780
unknown authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/51


mysql-test/Makefile.am:
  Auto merged
```
c5c1f780
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 · c1ab6ade
unknown authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


mysql-test/Makefile.am:
  Auto merged
```
c1ab6ade

make dist now copies .test files in mysql-test/include · cea3d809

unknown authored Nov 14, 2006


mysql-test/Makefile.am:
  add include/*.test to dist-hook and install-data-local targets to include the three .test files in mysql-test/include with make dist

cea3d809

13 Nov, 2006 3 commits

configure.in: · 46642dc2

unknown authored Nov 13, 2006

  Raise version number after cloning 5.1.13


configure.in:
  Raise version number after cloning 5.1.13

46642dc2

support-files/mysql.spec.sh : Make the server report its features in the first test run. · c8e7e74b

unknown authored Nov 13, 2006

support-files/mysql.spec.sh:
1) Ensure that the features of each server built are reported in the first test run it takes.
2) Add "--with-partition" to the change log (missing on previous push).

c8e7e74b

Build the generic RPMs including the "partition" feature. bug#23949 · 15cb9dab

unknown authored Nov 13, 2006


support-files/mysql.spec.sh:
  Add the "partition" feature to the server configuration, whether debugging or not.
  (bug#23949)

15cb9dab

12 Nov, 2006 3 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · 7f51633b
  unknown authored Nov 12, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  7f51633b
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · ed146a13
  unknown authored Nov 12, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  ed146a13
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 2433e766
  unknown authored Nov 12, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  2433e766
11 Nov, 2006 5 commits

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0 · 82190b9d

unknown authored Nov 11, 2006

into  mysql.com:/Users/kent/mysql/bk/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged

82190b9d

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · 31481f02
unknown authored Nov 11, 2006
```
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
31481f02

mysql-test-run.pl: · c60d8fb1

unknown authored Nov 11, 2006

  Test for base directory when a RPM install corrected


mysql-test/mysql-test-run.pl:
  Test for base directory when a RPM install corrected

c60d8fb1

Merge bodhi.local:/opt/local/work/mysql-5.0-runtime · dbf89ef5

unknown authored Nov 11, 2006

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/time.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged

dbf89ef5

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 5ae4c26e

unknown authored Nov 11, 2006

into  bodhi.local:/opt/local/work/mysql-5.0-runtime


configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/t/rename.test:
  Use local (resolve a conflict)

5ae4c26e

10 Nov, 2006 22 commits

Merge trift2.:/M50/mysql-5.0 · 5f34139f
unknown authored Nov 10, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
5f34139f

Merge trift2.:/MySQL/M50/push-5.0 · d4be3654

unknown authored Nov 10, 2006

into  trift2.:/MySQL/M51/push-5.1


BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Auto merged
configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run-shell.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/time.cc:
  Auto merged
storage/myisam/sort.c:
  Auto merged

d4be3654

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 8398b8cf

unknown authored Nov 10, 2006

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51


mysql-test/mysql-test-run.pl:
  Auto merged

8398b8cf

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · d30742f3

unknown authored Nov 10, 2006

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51


mysql-test/mysql-test-run.pl:
  Auto merged

d30742f3

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 70369f61
unknown authored Nov 10, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
```
70369f61

Merge trift2.:/MySQL/M50/bug24023-5.0 · b1574c4c

unknown authored Nov 10, 2006

into  trift2.:/MySQL/M50/push-5.0


BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Auto merged

b1574c4c

Merge trift2.:/MySQL/M41/push-4.1 · 2b38d3eb

unknown authored Nov 10, 2006

into  trift2.:/MySQL/M50/push-5.0


BitKeeper/deleted/.del-gcc.cpp~3d2e013cfac48838:
  Auto merged
configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/time.cc:
  Auto merged
myisam/sort.c:
  Manual merge: "use local" (= 5.0 version).
mysql-test/mysql-test-run.pl:
  Manual merge, part of the fix for bug#17194.

2b38d3eb

Merge trift2.:/MySQL/M41/bug17194-4.1 · a8aba345
unknown authored Nov 10, 2006
```
into  trift2.:/MySQL/M41/push-4.1
```
a8aba345

Merge trift2.:/MySQL/M41/clone-4.1 · 94e45811

unknown authored Nov 10, 2006

into  trift2.:/MySQL/M41/push-4.1


myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Manual merge.

94e45811

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8bde499f
unknown authored Nov 10, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
```
8bde499f
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · f91f36a3
unknown authored Nov 10, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


mysql-test/mysql-test-run.pl:
  merge
```
f91f36a3
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 · 9c543eb2
unknown authored Nov 10, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/51


mysql-test/mysql-test-run.pl:
  SCCS merged
```
9c543eb2

Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 · 811626d7

unknown authored Nov 10, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


mysql-test/mysql-test-run.pl:
  Auto merged

811626d7

add --report-features to mysql-test-run.pl · 92131d1f

unknown authored Nov 10, 2006


mysql-test/mysql-test-run.pl:
  add --report-features
mysql-test/include/report-features.test:
  test file showing server features for mysql-test-run.pl --report-features

92131d1f

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 1f34f659

unknown authored Nov 10, 2006

into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191


configure.in:
  Auto merged
include/my_time.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/rename.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/time.cc:
  Auto merged
mysql-test/t/rename.test:
  choose one of the race problem solutions. It was solved
  differently in -runtime and mainstream

1f34f659

Merge ted.mysql.internal:/home/ted/src/mysql/50-gca · a5c21349

unknown authored Nov 10, 2006

into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged

a5c21349

Memory allocation bug fixed · 3a6a2d70
unknown authored Nov 10, 2006

3a6a2d70
Merge mysql.com:/Users/kent/mysql/bk/lic/my51-lic · d0cf0031
unknown authored Nov 10, 2006
```
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1
```
d0cf0031

Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic · c77e435f

unknown authored Nov 10, 2006

into  mysql.com:/Users/kent/mysql/bk/lic/my51-lic


mysql-test/mysql-test-run-shell.sh:
  Auto merged

c77e435f

Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic · 05d50223
unknown authored Nov 10, 2006
```
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
05d50223

Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic · 58462e23

unknown authored Nov 10, 2006

into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic


mysql-test/mysql-test-run.sh:
  Auto merged

58462e23

mysql-test-run.sh: · 921746a8

unknown authored Nov 10, 2006

  Added --force-restart pseudo server argument to shell version as well


mysql-test/mysql-test-run.sh:
  Added --force-restart pseudo server argument to shell version as well

921746a8

09 Nov, 2006 4 commits

mysql-test/install_test_db.sh · df092d70

unknown authored Nov 09, 2006

    Adapt to the different path of the server program, if installation was by RPM.
    Missing in the first changeset for bug#17194.


mysql-test/install_test_db.sh:
  Adapt to the different path of the server program, if installation was by RPM.
  Missing in the first changeset for bug#17194.

df092d70

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 02df1593

unknown authored Nov 09, 2006

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/51


client/mysql_upgrade.c:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Auto merged
mysql-test/t/im_daemon_life_cycle.imtest:
  Auto merged
vio/viosslfactories.c:
  Auto merged

02df1593

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50 · 8fa310a2

unknown authored Nov 09, 2006

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/51


storage/innobase/buf/buf0buf.c:
  use local
storage/innobase/buf/buf0flu.c:
  use local
storage/innobase/buf/buf0lru.c:
  use local
storage/innobase/dict/dict0crea.c:
  use local
storage/innobase/fil/fil0fil.c:
  use local
storage/innobase/include/buf0buf.h:
  use local
storage/innobase/include/buf0buf.ic:
  use local
storage/innobase/include/dict0crea.h:
  use local
storage/innobase/include/sync0arr.h:
  use local
storage/innobase/include/sync0rw.h:
  use local
storage/innobase/include/sync0rw.ic:
  use local
storage/innobase/include/sync0sync.h:
  use local
storage/innobase/os/os0sync.c:
  use local
storage/innobase/row/row0mysql.c:
  use local
storage/innobase/row/row0sel.c:
  use local
storage/innobase/srv/srv0start.c:
  use local
storage/innobase/sync/sync0arr.c:
  use local
storage/innobase/sync/sync0rw.c:
  use local
storage/innobase/sync/sync0sync.c:
  use local

8fa310a2

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/41 · 8b7282e2
unknown authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50


innobase/fil/fil0fil.c:
  use local
```
8b7282e2