Commits · ce805aff3fc9cc5629d088635530b097b58b0c6f · Kirill Smelkov / mariadb

10 Nov, 2006 14 commits
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · ce805aff
  tsmith@quadxeon.mysql.com authored Nov 10, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
```
  ce805aff
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 82b6712a
  tsmith@quadxeon.mysql.com authored Nov 10, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
```
  82b6712a
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · b2da711f
  tsmith@quadxeon.mysql.com authored Nov 10, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
```
  b2da711f
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 403ecf18
  df@kahlann.erinye.com authored Nov 10, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
```
  403ecf18
- Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 · abd8eeaa
  df@kahlann.erinye.com authored Nov 10, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/51
```
  abd8eeaa
- Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 · 59e33edf
  df@kahlann.erinye.com authored Nov 10, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
```
  59e33edf
- add --report-features to mysql-test-run.pl · f1764fa9
  df@kahlann.erinye.com authored Nov 10, 2006
  
  f1764fa9
- Merge ted.mysql.internal:/home/ted/src/mysql/50-gca · 1c8a6cfc
  ted@ted.mysql.internal authored Nov 10, 2006
```
into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
```
  1c8a6cfc
- Memory allocation bug fixed · bc9ca699
  ted@ted.mysql.internal authored Nov 10, 2006
  
  bc9ca699
- Merge mysql.com:/Users/kent/mysql/bk/lic/my51-lic · ef9f68a7
  kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se authored Nov 10, 2006
```
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1
```
  ef9f68a7
- Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic · 040f9549
  kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se authored Nov 10, 2006
```
into  mysql.com:/Users/kent/mysql/bk/lic/my51-lic
```
  040f9549
- Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic · 54f6fc07
  kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se authored Nov 10, 2006
```
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
  54f6fc07
- Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic · 264beeff
  kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se authored Nov 10, 2006
```
into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic
```
  264beeff
- mysql-test-run.sh: · f8931288
  kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se authored Nov 10, 2006
```
  Added --force-restart pseudo server argument to shell version as well
```
  f8931288
09 Nov, 2006 6 commits

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · 8f92859e
tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/51
```
8f92859e
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50 · 03d07ea3
tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/51
```
03d07ea3
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/41 · e9b42a4b
tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/inno/50
```
e9b42a4b
This ChangeSet must be null-merged to 5.0. Applied innodb-4.1-ss33 · c2aca91b
tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
Fixes:
- Bug #24089: Race condition in fil_flush_file_spaces()
```
c2aca91b

This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003 · f1e0cf9d

tsmith@quadxeon.mysql.com authored Nov 09, 2006

Fixes:
- Bug #15815: Very poor performance with multiple queries running concurrently
- Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #23769: Debug assertion failure with innodb_locks_unsafe_for_binlog
- Bug #24089: Race condition in fil_flush_file_spaces()

f1e0cf9d

Applied innodb-5.1-ss1004 · 18080530

tsmith@quadxeon.mysql.com authored Nov 09, 2006

Fixes:
- Bug #15815: Very poor performance with multiple queries running concurrently
- Bug #22868: 'Thread thrashing' with > 50 concurrent conns under an upd-intensive workloadw
- Bug #24089: Race condition in fil_flush_file_spaces()

18080530

08 Nov, 2006 20 commits
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · a77dde86
  tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
```
  a77dde86
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41 · 41117b12
  tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
```
  41117b12
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g41 · 246ec191
  tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/41
```
  246ec191
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · a7b14244
  tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
```
  a7b14244
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g51 · 9e3e6a7c
  tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
```
  9e3e6a7c
- Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/g50 · f663ba45
  tsmith@quadxeon.mysql.com authored Nov 09, 2006
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
```
  f663ba45
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · d18ee2de
  msvensson@neptunus.(none) authored Nov 09, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  d18ee2de
- Fix warnings and NetWare compile failure · f032a223
  msvensson@neptunus.(none) authored Nov 09, 2006
  
  f032a223
- Merge bk-internal:/home/bk/mysql-5.1-new-maint · feba3240
  msvensson@neptunus.(none) authored Nov 08, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  feba3240
- Merge bk-internal:/home/bk/mysql-5.0-maint · 0ec64326
  msvensson@neptunus.(none) authored Nov 08, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  0ec64326
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint · b4f20c56
  msvensson@neptunus.(none) authored Nov 08, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
```
  b4f20c56
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · a620a3ab
  msvensson@neptunus.(none) authored Nov 08, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  a620a3ab
- Update of --mem flag after comments · 90d8d7b5
  msvensson@neptunus.(none) authored Nov 08, 2006
  
  90d8d7b5
- No need to pass an additional arg to to mtr_add_arg when there is no % sign · 174bfe9d
  msvensson@neptunus.(none) authored Nov 08, 2006
  
  174bfe9d
- Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint · 4dfbc712
  msvensson@neptunus.(none) authored Nov 08, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
```
  4dfbc712
- Pass location of charsets dir to mysqltest to avoid using the charsetdir... · 1437500c
  msvensson@neptunus.(none) authored Nov 08, 2006
```
Pass location of charsets dir to mysqltest to avoid using the charsetdir locally installed on machine. 
```
  1437500c
- Don't run mysqltest with both --silent and --verbose · 34f2c99d
  msvensson@neptunus.(none) authored Nov 08, 2006
  
  34f2c99d
- Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 · 9421205b
  anozdrin/alik@alik. authored Nov 08, 2006
```
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt
```
  9421205b
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my51-bug10963 · d9845ccf
  cmiller@zippy.cornsilk.net authored Nov 08, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  d9845ccf
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug10963/my50-bug10963 · c6b02840
  cmiller@zippy.cornsilk.net authored Nov 08, 2006
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
```
  c6b02840