Commits · 9f96125023be05659ab257a1c6af6fe1dd024932 · Kirill Smelkov / mariadb

21 Dec, 2007 3 commits
- Merge trift2.:/MySQL/M51/mysql-5.1 · 9f961250
  joerg@trift2. authored Dec 21, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  9f961250
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · bea1bfd5
  df@pippilotta.erinye.com authored Dec 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  bea1bfd5
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-33288-33057 · f25c6ffa
  df@pippilotta.erinye.com authored Dec 21, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  f25c6ffa
20 Dec, 2007 3 commits
- BUG#33057 mysql command line client slows down and uses 100% CPU when restoring dump · f7527b78
  df@pippilotta.erinye.com authored Dec 20, 2007
  
  f7527b78
- Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch · 97e3c6cb
  brian@zim.(none) authored Dec 20, 2007
```
into  zim.(none):/home/bk/mysql-5.1-arch
```
  97e3c6cb
- client_priv.h: · 4316829b
  brian@zim.(none) authored Dec 20, 2007
```
  Removed dead option
mysqlslap.c:
  Updates from Paul for help.
  Removed dead option
```
  4316829b
17 Dec, 2007 5 commits
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 92de4d5e
  df@pippilotta.erinye.com authored Dec 17, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  92de4d5e
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 01b6c78f
  df@pippilotta.erinye.com authored Dec 17, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  01b6c78f
- Merge trift2.:/MySQL/M50/push-5.0 · e591fc7c
  joerg@trift2. authored Dec 17, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  e591fc7c
- Merge trift2.:/MySQL/M51/mysql-5.1 · af73c6c8
  joerg@trift2. authored Dec 17, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  af73c6c8
- Merge trift2.:/MySQL/M50/mysql-5.0 · 7bd4ac4d
  joerg@trift2. authored Dec 17, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  7bd4ac4d
15 Dec, 2007 5 commits
- Try to fix assertion failures at slave shutdown when running · 16f0bd71
  kostja@bodhi.(none) authored Dec 15, 2007
```
rpl_ndb tests on sapsrv1.
```
  16f0bd71
- Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 2e82e666
  kostja@bodhi.(none) authored Dec 15, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
  2e82e666
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4bb50356
  kostja@bodhi.(none) authored Dec 15, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
```
  4bb50356
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · bffc615e
  kostja@bodhi.(none) authored Dec 15, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
  bffc615e
- WL#4165 (Prepared statements: validation) · 0488056c
  malff@lambda.hsd1.co.comcast.net. authored Dec 14, 2007
```
Adding the tests cases alone for WL#4165, disabled
```
  0488056c
14 Dec, 2007 18 commits
- Bug#26811 Symbolic links don't work in Windows Vista · 6bb288b6
  iggy@amd64.(none) authored Dec 14, 2007
```
- Enable check for symbolic link files.
```
  6bb288b6
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 2db74257
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  2db74257
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 1a3bf733
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
```
  1a3bf733
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · d2a93fd6
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  d2a93fd6
- Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0 · 8105bd46
  jperkin/jonathan@chorlton.adsl.perkin.org.uk authored Dec 14, 2007
```
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.1
```
  8105bd46
- Raise version number after cloning 5.0.54 · 028ed336
  kent/mysqldev@mysql.com/production.mysql.com authored Dec 14, 2007
  
  028ed336
- Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 2a404c23
  jperkin/jonathan@chorlton.adsl.perkin.org.uk authored Dec 14, 2007
```
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0
```
  2a404c23
- post-commit: · 89153ffa
  jperkin/jonathan@chorlton.adsl.perkin.org.uk authored Dec 14, 2007
```
  Rationalise setting $FROM.
```
  89153ffa
- Merge station.:/mnt/raid/alik/MySQL/devel/5.0-rt · 6ebedc86
  anozdrin/alik@station. authored Dec 14, 2007
```
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-5.0-rt
```
  6ebedc86
- Merge station.:/mnt/raid/alik/MySQL/devel/5.1 · 151444c6
  anozdrin/alik@station. authored Dec 14, 2007
```
into  station.:/mnt/raid/alik/MySQL/devel/5.1-rt
```
  151444c6
- Merge station.:/mnt/raid/alik/MySQL/devel/5.0 · 61b903f8
  anozdrin/alik@station. authored Dec 14, 2007
```
into  station.:/mnt/raid/alik/MySQL/devel/5.0-rt
```
  61b903f8
- Merge ramayana.hindu.god:/home/tsmith/m/bk/build/b33192/51 · 3a6b3052
  tsmith@ramayana.hindu.god authored Dec 14, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
```
  3a6b3052
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 04d815cf
  df@pippilotta.erinye.com authored Dec 14, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  04d815cf
- typo · 26bd6a2c
  df@pippilotta.erinye.com authored Dec 14, 2007
  
  26bd6a2c
- BUG#31880 make test failure from public bk tree · be2d78e3
  df@pippilotta.erinye.com authored Dec 14, 2007
  
  be2d78e3
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge · 0f58ed97
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  0f58ed97
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 0bd2a86e
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  0bd2a86e
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 70902cdd
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  70902cdd
13 Dec, 2007 6 commits
- Remove an unused argument of sql_update::do_updates(). · 614b0f68
  kostja@bodhi.(none) authored Dec 14, 2007
  
  614b0f68
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 7c8fe302
  kostja@bodhi.(none) authored Dec 13, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
  7c8fe302
- Fix broken embedded build (broken by the patch for Bug#12713, first part). · 5b80d6a1
  kostja@bodhi.(none) authored Dec 13, 2007
  
  5b80d6a1
- Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · a2486e0d
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
  a2486e0d
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 4bc90fe4
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  4bc90fe4
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · e9466462
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
```
  e9466462