Commits · bbb9ba764754f91b144b01db16a8f9b3f5d3dd67 · nexedi / MariaDB

20 Dec, 2006 3 commits

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

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

bbb9ba76

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


BUILD/check-cpu:
  Auto merged
```
c4b4bd69

BUG#20061 build script can not detect my cpu · cdd5a353

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

cdd5a353

19 Dec, 2006 2 commits

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

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

cc21a482

remove hard-coded socket paths from some tests · 2eeeb9b4

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

2eeeb9b4

18 Dec, 2006 7 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · b871e8d2
  unknown authored Dec 18, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
  b871e8d2
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · 0a27651f
  unknown authored Dec 18, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
```
  0a27651f
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 052624e1
  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
```
  052624e1
- Use a temporary directory for sockets if the socket path becomes too long. · e55c9a7a
  unknown authored Dec 18, 2006
  
  e55c9a7a
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · 5958296b
  unknown authored Dec 18, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  5958296b
- Merge trift2.:/MySQL/M50/push-5.0 · fd0a4f22
  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
```
  fd0a4f22
- support-files/mysql.spec.sh · 134b83d0
  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.
```
  134b83d0
15 Dec, 2006 3 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · d26bbd00
  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
```
  d26bbd00
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · 5029f272
  unknown authored Dec 15, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
  5029f272
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · 0085879f
  unknown authored Dec 15, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  0085879f
14 Dec, 2006 11 commits

Merge trift2.:/MySQL/M41/spec-4.1 · 8ca9c928
unknown authored Dec 14, 2006
```
into  trift2.:/MySQL/M41/push-4.1
```
8ca9c928
Merge trift2.:/MySQL/M50/spec-5.0 · 0221a9bd
unknown authored Dec 14, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
0221a9bd
Merge trift2.:/MySQL/M50/spec-5.0 · 8a2b3baa
unknown authored Dec 14, 2006
```
into  trift2.:/MySQL/M51/spec-5.1


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

support-files/mysql.spec.sh · 13eeee6f

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.

13eeee6f

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

unknown authored Dec 14, 2006

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


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

d4808679

support-files/mysql.spec.sh · 007357e7

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

007357e7

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

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · 32fcce2b

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

32fcce2b

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 · 430b2eaf
unknown authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
430b2eaf
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · 39d873cf
unknown authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
```
39d873cf
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 · ba79c766
unknown authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
ba79c766

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


sql/sql_class.h:
  Auto merged
```
  92791f80
- Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 4333606d
  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
```
  4333606d
- BUG#24902 in 5.0 · f67380eb
  unknown authored Dec 12, 2006
```
mysql-test/Makefile.am:
  BUG#24902
```
  f67380eb
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · 41087253
  unknown authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


sql/sql_class.h:
  Auto merged
```
  41087253
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 7433bdfa
  unknown authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  7433bdfa
- BUG#24902 · e322b098
  unknown authored Dec 12, 2006
  
  e322b098
11 Dec, 2006 4 commits
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 1c1c35d2
  unknown authored Dec 11, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
```
  1c1c35d2
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1 · 7dca488c
  unknown authored Dec 11, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
  7dca488c
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · fb9d6963
  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
```
  fb9d6963
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 · 9a084eac
  unknown authored Dec 11, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  9a084eac
07 Dec, 2006 4 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · ee876b26
  unknown authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  ee876b26
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 1a899c05
  unknown authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  1a899c05
- do not autorelease build ids when a child of mysql-test-run.pl dies · 60b3a86a
  unknown authored Dec 07, 2006
```
mysql-test/lib/mtr_unique.pl:
  do not autorelease build ids when a child dies
```
  60b3a86a
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · abb4f348
  unknown authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


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