Commits · aee48b346fcc5d4c16cc5a134ddd5f3279b7df2e · Kirill Smelkov / mariadb

20 Dec, 2006 2 commits
- Merge siva.hindu.god:/usr/home/tim/m/bk/50-build · aee48b34
  tsmith/tim@siva.hindu.god authored Dec 20, 2006
```
into  siva.hindu.god:/usr/home/tim/m/bk/51-build
```
  aee48b34
- Merge trift2.:/MySQL/M50/upward-5.0 · 7f0cb242
  joerg@trift2. authored Dec 20, 2006
```
into  trift2.:/MySQL/M51/push-5.1
```
  7f0cb242
19 Dec, 2006 1 commit

This ChangeSet must be null-merged to 5.1. · d60550a4

tsmith/tim@siva.hindu.god authored Dec 18, 2006

Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.

Bugs fixed:
- Bug #21468: InnoDB crash during recovery with corrupted data pages: XA bug?
- Bug #24299: Identifiers in foreign keys cannot contain U+0160, U+0360, ..., U+FF60
- Bug #24386: Performance degradation caused by instrumentation in mutex_struct
- Bug #24712: SHOW TABLE STATUS for file-per-table showing incorrect time fields

d60550a4

18 Dec, 2006 6 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 038f0051
  df@kahlann.erinye.com authored Dec 18, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release
```
  038f0051
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 5ad288f1
  df@kahlann.erinye.com authored Dec 18, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  5ad288f1
- Use a temporary directory for sockets if the socket path becomes too long. · 4a98f36e
  df@kahlann.erinye.com authored Dec 18, 2006
  
  4a98f36e
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · c78b3c4e
  df@kahlann.erinye.com authored Dec 18, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  c78b3c4e
- Merge trift2.:/MySQL/M50/push-5.0 · c011b2e7
  joerg@trift2. authored Dec 18, 2006
```
into  trift2.:/MySQL/M51/push-5.1
```
  c011b2e7
- support-files/mysql.spec.sh · 534b2ca0
  joerg@trift2. authored Dec 18, 2006
```
    Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
```
  534b2ca0
15 Dec, 2006 5 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · 6a0ce672
  df@kahlann.erinye.com authored Dec 15, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  6a0ce672
- also include data files for varbinary test in binary distribution · 905d9e84
  df@kahlann.erinye.com authored Dec 15, 2006
  
  905d9e84
- minor fixup · 0cce2405
  df@kahlann.erinye.com authored Dec 15, 2006
  
  0cce2405
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · c4676b69
  df@kahlann.erinye.com authored Dec 15, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
  c4676b69
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · 91143541
  df@kahlann.erinye.com authored Dec 15, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  91143541
14 Dec, 2006 9 commits
- Merge trift2.:/MySQL/M50/spec-5.0 · daba0ecb
  joerg@trift2. authored Dec 14, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  daba0ecb
- Merge trift2.:/MySQL/M50/spec-5.0 · 436aa807
  joerg@trift2. authored Dec 14, 2006
```
into  trift2.:/MySQL/M51/spec-5.1
```
  436aa807
- support-files/mysql.spec.sh · a62051b7
  joerg@trift2. authored Dec 14, 2006
```
    The "mysqlmanager" man page got moved from section 1 to 8.
```
  a62051b7
- Merge trift2.:/MySQL/M41/spec-4.1 · 8bdcf736
  joerg@trift2. authored Dec 14, 2006
```
into  trift2.:/MySQL/M50/spec-5.0
```
  8bdcf736
- support-files/mysql.spec.sh · 5582d601
  joerg@trift2. authored Dec 14, 2006
```
    The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
```
  5582d601
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build · 02d6bcaa
  df@kahlann.erinye.com authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
```
  02d6bcaa
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build · 0231b019
  df@kahlann.erinye.com authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  0231b019
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · 95564bfe
  df@kahlann.erinye.com authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
```
  95564bfe
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 · e0f9996e
  df@kahlann.erinye.com authored Dec 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  e0f9996e
12 Dec, 2006 6 commits
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 6a49f0cd
  gluh@gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  6a49f0cd
- Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · c6d9cf1b
  gluh@gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  c6d9cf1b
- BUG#24902 in 5.0 · bd44245e
  df@kahlann.erinye.com authored Dec 12, 2006
  
  bd44245e
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · 635a5641
  gluh@mysql.com/gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  635a5641
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 118a0c7f
  gluh@mysql.com/gluh.(none) authored Dec 12, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  118a0c7f
- BUG#24902 · 682f8fe2
  df@kahlann.erinye.com authored Dec 12, 2006
  
  682f8fe2
11 Dec, 2006 3 commits
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · f0f4d3c0
  gluh@mysql.com/gluh.(none) authored Dec 11, 2006
```
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
```
  f0f4d3c0
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 · 476632aa
  df@kahlann.erinye.com authored Dec 11, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
```
  476632aa
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1 · 024597b3
  df@kahlann.erinye.com authored Dec 11, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  024597b3
07 Dec, 2006 8 commits
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 8fffa20a
  df@kahlann.erinye.com authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  8fffa20a
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · 75c71141
  df@kahlann.erinye.com authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  75c71141
- do not autorelease build ids when a child of mysql-test-run.pl dies · 19ec379b
  df@kahlann.erinye.com authored Dec 07, 2006
  
  19ec379b
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work · 01395b1d
  df@kahlann.erinye.com authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build
```
  01395b1d
- Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work · bb1297cd
  df@kahlann.erinye.com authored Dec 07, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
```
  bb1297cd
- BUG#24780 use --sysconfdir in scripts · 77965c01
  df@kahlann.erinye.com authored Dec 07, 2006
  
  77965c01
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c24381bd
  andrey@example.com authored Dec 07, 2006
```
into  example.com:/work/mysql-5.1-maint
```
  c24381bd
- Additional fix for bug#22369 · 12a68db3
  andrey@example.com authored Dec 07, 2006
  
  12a68db3