Commits · 41971602c55d7136cb60783b17742bbb0a175f6f · nexedi / MariaDB

20 Dec, 2006 3 commits

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 41971602

unknown authored Dec 20, 2006

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


BUILD/check-cpu:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl000017.test:
  change from 5.0 does not apply here anymore
mysql-test/t/rpl_000015.test:
  after-merge fix

41971602

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 5fa71f7b
unknown authored Dec 20, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


BUILD/check-cpu:
  Auto merged
```
5fa71f7b

BUG#20061 build script can not detect my cpu · 64100ecc

unknown authored Dec 20, 2006


BUILD/check-cpu:
  add a handful of Celeroni and automatic fallback to uname if /proc/cpuinfo is there but we don't understand the information in it

64100ecc

19 Dec, 2006 2 commits

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 2702ca91

unknown authored Dec 19, 2006

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


mysql-test/t/grant_cache.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/query_cache_notembedded.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/rpl000015.test:
  SCCS merged
mysql-test/t/rpl000017.test:
  SCCS merged

2702ca91

remove hard-coded socket paths from some tests · 0efda25c

unknown authored Dec 19, 2006


mysql-test/t/grant_cache.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/myisam.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/query_cache_notembedded.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/rpl000015.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/rpl000017.test:
  replace hard-coded socket paths with variable containing the appropriate path
mysql-test/t/rpl_rotate_logs.test:
  replace hard-coded socket paths with variable containing the appropriate path

0efda25c

18 Dec, 2006 7 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · 4c838eb6
  unknown authored Dec 18, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
  4c838eb6
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · 4cef071f
  unknown authored Dec 18, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
```
  4cef071f
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · ff39352a
  unknown authored Dec 18, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/mysql-test-run.pl:
  Auto merged
```
  ff39352a
- Use a temporary directory for sockets if the socket path becomes too long. · 112059b4
  unknown authored Dec 18, 2006
  
  112059b4
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · f6586593
  unknown authored Dec 18, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  f6586593
- Merge trift2.:/MySQL/M50/push-5.0 · cb6dcb7e
  unknown authored Dec 18, 2006
```
into  trift2.:/MySQL/M51/push-5.1


mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
```
  cb6dcb7e
- support-files/mysql.spec.sh · 55e0fc53
  unknown authored Dec 18, 2006
```
    Fix the move of "mysqlmanager" to section 8: Directory name was wrong.


support-files/mysql.spec.sh:
  Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
```
  55e0fc53
15 Dec, 2006 3 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · b012cf1f
  unknown authored Dec 15, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


mysql-test/mysql-test-run.pl:
  Auto merged
```
  b012cf1f
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · d8891776
  unknown authored Dec 15, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
  d8891776
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · 2ba9e192
  unknown authored Dec 15, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  2ba9e192
14 Dec, 2006 11 commits

Merge trift2.:/MySQL/M41/spec-4.1 · 6a842b25
unknown authored Dec 14, 2006
```
into  trift2.:/MySQL/M41/push-4.1
```
6a842b25
Merge trift2.:/MySQL/M50/spec-5.0 · 62f4364c
unknown authored Dec 14, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
62f4364c
Merge trift2.:/MySQL/M50/spec-5.0 · c7ad8346
unknown authored Dec 14, 2006
```
into  trift2.:/MySQL/M51/spec-5.1


support-files/mysql.spec.sh:
  SCCS merged
```
c7ad8346

support-files/mysql.spec.sh · 2a3b6f06

unknown authored Dec 14, 2006

    The "mysqlmanager" man page got moved from section 1 to 8.


support-files/mysql.spec.sh:
  The "mysqlmanager" man page got moved from section 1 to 8.

2a3b6f06

Merge trift2.:/MySQL/M41/spec-4.1 · ef27b9ea

unknown authored Dec 14, 2006

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


support-files/mysql.spec.sh:
  Manual merge.

ef27b9ea

support-files/mysql.spec.sh · f7d49bfb

unknown authored Dec 14, 2006

The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".

support-files/mysql.spec.sh:
The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".

f7d49bfb

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · be8136ed
unknown authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
be8136ed

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · 2d84c1e0

unknown authored Dec 14, 2006

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


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

2d84c1e0

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 · 5b2d4dcf
unknown authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
5b2d4dcf
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · e28543a4
unknown authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
```
e28543a4
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 · e3026e7b
unknown authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
e3026e7b

12 Dec, 2006 6 commits
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · a7572c02
  unknown authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/sql_class.h:
  Auto merged
```
  a7572c02
- Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · e564a61f
  unknown authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


mysql-test/r/gis.result:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
```
  e564a61f
- BUG#24902 in 5.0 · d9d491dd
  unknown authored Dec 12, 2006
```
mysql-test/Makefile.am:
  BUG#24902
```
  d9d491dd
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · 2d870ee7
  unknown authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


sql/sql_class.h:
  Auto merged
```
  2d870ee7
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 52e66d7c
  unknown authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  52e66d7c
- BUG#24902 · 5d307a5e
  unknown authored Dec 12, 2006
  
  5d307a5e
11 Dec, 2006 4 commits
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 950dc66a
  unknown authored Dec 11, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
```
  950dc66a
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 · bac7e3e6
  unknown authored Dec 11, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
  bac7e3e6
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · 6d5ebe45
  unknown authored Dec 11, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build


mysql-test/mysql-test-run.pl:
  Auto merged
```
  6d5ebe45
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 · 90653f78
  unknown authored Dec 11, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  90653f78
07 Dec, 2006 4 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 83597cce
  unknown authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  83597cce
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 3c019f6c
  unknown authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  3c019f6c
- do not autorelease build ids when a child of mysql-test-run.pl dies · 7d73dccc
  unknown authored Dec 07, 2006
```
mysql-test/lib/mtr_unique.pl:
  do not autorelease build ids when a child dies
```
  7d73dccc
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · d01e4577
  unknown authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


scripts/Makefile.am:
  Auto merged
```
  d01e4577