Commits · 9fc05a5860d7b816d4fb888797fe3085b9e06b17 · nexedi / MariaDB

21 Jun, 2007 3 commits
- Merge trift2.:/MySQL/M50/push-5.0 · 9fc05a58
  joerg@trift2. authored Jun 21, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  9fc05a58
- Merge trift2.:/MySQL/M50/mysql-5.0 · 2a03eaf8
  joerg@trift2. authored Jun 21, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  2a03eaf8
- Merge trift2.:/MySQL/M51/mysql-5.1 · 1d696ef8
  joerg@trift2. authored Jun 21, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  1d696ef8
20 Jun, 2007 4 commits
- Enable the disabled test case for Bug#28075 (pushbuild by now · 7758a5de
  kostja@bodhi.(none) authored Jun 20, 2007
```
should be fixed).
```
  7758a5de
- Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 72ff5488
  kostja@bodhi.(none) authored Jun 20, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
  72ff5488
- Disable randomly failing tests: · a1fefd4e
  kostja@bodhi.(none) authored Jun 20, 2007
```
rpl_udf -- Bug#28993 rpl_udf test causes server crash and valgrind
warning in pushbuild
rpl_ndb_circular -- Bug#29233 rpl_ndb_circular fails randomly
ndb_dd_sql_features -- Bug#29102 ndb_dd_sql_features fails in
pushbuild
```
  a1fefd4e
- Fix a typo. · 9ff8e6d7
  kostja@bodhi.(none) authored Jun 20, 2007
  
  9ff8e6d7
19 Jun, 2007 9 commits
- Fix a merge mistake. · 4fd81584
  kostja@bodhi.(none) authored Jun 19, 2007
  
  4fd81584
- Manual merge. · 68632318
  kostja@bodhi.(none) authored Jun 19, 2007
  
  68632318
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 325b8835
  kostja@bodhi.(none) authored Jun 19, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
```
  325b8835
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 7621de23
  df@pippilotta.erinye.com authored Jun 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
  7621de23
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 71b4000c
  df@pippilotta.erinye.com authored Jun 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
  71b4000c
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7eea7fff
  df@pippilotta.erinye.com authored Jun 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
```
  7eea7fff
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 26d83bae
  df@pippilotta.erinye.com authored Jun 19, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
  26d83bae
- try again. · f927d505
  df@pippilotta.erinye.com authored Jun 19, 2007
  
  f927d505
- Merge adventure.(none):/home/thek/Development/cpp/bug28211/my51-bug28211 · a0b8394c
  thek@adventure.(none) authored Jun 19, 2007
```
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
```
  a0b8394c
18 Jun, 2007 24 commits
- Merge trift2.:/MySQL/M50/push-5.0 · 2e31f408
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  2e31f408
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 0608cafb
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  0608cafb
- Merge trift2.:/MySQL/M41/push-4.1 · 7e060d76
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  7e060d76
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build · f0d63496
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  f0d63496
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-build · 57853e7d
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  57853e7d
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 09ff8d09
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  09ff8d09
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · f52337a6
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  f52337a6
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · 03d9ef1f
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  03d9ef1f
- Merge trift2.:/MySQL/M50/push-5.0 · 4f6b3d10
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  4f6b3d10
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 0ef1abae
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  0ef1abae
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · dd7185ea
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  dd7185ea
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-build · 1067f08a
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
```
  1067f08a
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · e9387bf5
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  e9387bf5
- don't use bk cset in commit e-mails · 94a3e239
  df@pippilotta.erinye.com authored Jun 18, 2007
  
  94a3e239
- Merge trift2.:/MySQL/M41/push-4.1 · cf95b9e4
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  cf95b9e4
- Merge trift2.:/MySQL/M41/clone-4.1 · 1d09be38
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  1d09be38
- Bug#28211 RENAME DATABASE and query cache don't play nicely together · 2da91b23
  thek@adventure.(none) authored Jun 18, 2007
```
When all table blocks were removed from the query cache the client session
hung in a tight loop waiting on an impossible condition while consuming a lot
of CPU.

This patch also corrects an error which caused valid tables to sometimes be
removed from the query cache.
```
  2da91b23
- Merge trift2.:/MySQL/M41/mysql-4.1 · b9cc9dbb
  joerg@trift2. authored Jun 18, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  b9cc9dbb
- Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · 674675a7
  svoj@june.mysql.com authored Jun 18, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  674675a7
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · 621dd172
  svoj@june.mysql.com authored Jun 18, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  621dd172
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 491e471f
  svoj@june.mysql.com authored Jun 18, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  491e471f
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 7013c96f
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
  7013c96f
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 7cdb354d
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
  7cdb354d
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · f369105a
  df@pippilotta.erinye.com authored Jun 18, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
```
  f369105a