Commits · 23b7f4b78260b3869756c3b79e33548e51163f53 · nexedi / MariaDB

14 Nov, 2006 3 commits

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


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


mysql-test/Makefile.am:
  Auto merged
```
9020035f

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

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

b2957569

13 Nov, 2006 3 commits

configure.in: · 8da5141d

unknown authored Nov 13, 2006

  Raise version number after cloning 5.1.13


configure.in:
  Raise version number after cloning 5.1.13

8da5141d

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

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).

f2f94041

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

unknown authored Nov 13, 2006


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

b09ae0ab

12 Nov, 2006 3 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime · ce963d0c
  unknown authored Nov 12, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  ce963d0c
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · d1f5f590
  unknown authored Nov 12, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
```
  d1f5f590
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 383fbde5
  unknown authored Nov 12, 2006
```
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
```
  383fbde5
11 Nov, 2006 5 commits

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0 · 47bdda0b

unknown authored Nov 11, 2006

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


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

47bdda0b

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

mysql-test-run.pl: · c6d31783

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

c6d31783

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

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

c3d9588e

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 75a0878f

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)

75a0878f

10 Nov, 2006 22 commits

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

Merge trift2.:/MySQL/M50/push-5.0 · 0b2cb662

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

0b2cb662

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

unknown authored Nov 10, 2006

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


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

e0854cbc

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

unknown authored Nov 10, 2006

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


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

0bd4eaa7

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

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

unknown authored Nov 10, 2006

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


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

f4113236

Merge trift2.:/MySQL/M41/push-4.1 · 56934f9d

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.

56934f9d

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

Merge trift2.:/MySQL/M41/clone-4.1 · 744aadbe

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.

744aadbe

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


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


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

Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 · 0f8e62b4

unknown authored Nov 10, 2006

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


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

0f8e62b4

add --report-features to mysql-test-run.pl · df1b6ae6

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

df1b6ae6

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

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

cb80733a

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

unknown authored Nov 10, 2006

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


client/mysql_upgrade.c:
  Auto merged

b48ff93e

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

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

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

unknown authored Nov 10, 2006

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


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

65d25c75

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

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

unknown authored Nov 10, 2006

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


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

bb662f6e

mysql-test-run.sh: · facaaeb4

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

facaaeb4

09 Nov, 2006 4 commits

mysql-test/install_test_db.sh · 62e0e608

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.

62e0e608

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 298b1174

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

298b1174

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50 · 20e44a34

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

20e44a34

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


innobase/fil/fil0fil.c:
  use local
```
44f15cae