Commits · aa14dadf709756eb9019b6c2d0a1acc472f2274c · nexedi / MariaDB

29 May, 2007 7 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel · aa14dadf
  monty@narttu.mysql.fi authored May 29, 2007
```
into  mysql.com:/home/my/mysql-5.1
```
  aa14dadf
- Added casts to remove compiler warnings on windows · 0e2767e1
  monty@mysql.com/narttu.mysql.fi authored May 29, 2007
```
Give warnings also for safe_mutex errors found by test system
Added some warnings from different machines in pushbuild
```
  0e2767e1
- Disabled compiler warnings mainly for Win 64. · 617aaf10
  jani@hynda.mysql.fi authored May 29, 2007
  
  617aaf10
- Don't give warning that readonly variable is forced to be readonly · 2d6d4513
  monty@mysql.com/narttu.mysql.fi authored May 29, 2007
```
mysql-test-run run now fails if we have [Warning] and [ERROR] as tags in .err file
Fixed wrong reference to the mysql manual
Fixed wrong prototype that caused some tests to fail on 64 bit platforms
```
  2d6d4513
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel · 3d7ae2dd
  jani@a88-113-38-195.elisa-laajakaista.fi authored May 29, 2007
```
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
```
  3d7ae2dd
- Added casts and fixed wrong type. · e307fda7
  jani@a88-113-38-195.elisa-laajakaista.fi authored May 29, 2007
  
  e307fda7
- Added casts and fixed wrong type. · d7ab4e77
  jani@a88-113-38-195.elisa-laajakaista.fi authored May 29, 2007
  
  d7ab4e77
28 May, 2007 2 commits
- Added casts to avoid compiler warnings and fixed a wrong type. · a62555dc
  jani@a88-113-38-195.elisa-laajakaista.fi authored May 28, 2007
  
  a62555dc
- Changed accidently added tabs back into spaces. · b0352197
  jani@a88-113-38-195.elisa-laajakaista.fi authored May 28, 2007
```
Fixed a bug that came in merge.
```
  b0352197
24 May, 2007 13 commits
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · fa21379a
  jani@linux-th5m.site authored May 24, 2007
```
into  linux-th5m.site:/home/my/mysql-5.1-marvel
```
  fa21379a
- Merged from main 5.1 · ee4d6b4f
  jani@linux-th5m.site authored May 24, 2007
  
  ee4d6b4f
- Raise version number after cloning 5.1.19-beta · 7034295f
  jbruehe/mysqldev@mysql.com/production.mysql.com authored May 24, 2007
  
  7034295f
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · db9128f8
  joerg@trift2. authored May 24, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  db9128f8
- Makefile.am : Add "embedded" tests to the "test-bt" target. · 8592dfd9
  joerg@trift2. authored May 24, 2007
  
  8592dfd9
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · f1807e1f
  jani@linux-th5m.site authored May 24, 2007
```
into  linux-th5m.site:/home/my/mysql-5.1-marvel
```
  f1807e1f
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · fc3b3a0a
  jani@a88-113-38-195.elisa-laajakaista.fi authored May 24, 2007
```
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
```
  fc3b3a0a
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · a390ac46
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  a390ac46
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 2120cb89
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  2120cb89
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · d5422980
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  d5422980
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 · 7459b4fc
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  7459b4fc
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · d29eaed8
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  d29eaed8
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 918d90d5
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  918d90d5
23 May, 2007 9 commits
- Merge trift2.:/MySQL/M50/push-5.0 · fb47cb1c
  joerg@trift2. authored May 23, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  fb47cb1c
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 77e1e678
  df@pippilotta.erinye.com authored May 23, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  77e1e678
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0.42 · a70903b7
  df@pippilotta.erinye.com authored May 23, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  a70903b7
- Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines · 64d34f6e
  svoj@june.mysql.com authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  64d34f6e
- Merge mysql.com:/home/svoj/devel/bk/mysql-5.1 · 442969fd
  svoj@june.mysql.com authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
```
  442969fd
- Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines · 43b2dc18
  svoj@june.mysql.com authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  43b2dc18
- Merge mysql.com:/home/svoj/devel/bk/mysql-5.0 · 122167bb
  svoj@mysql.com/june.mysql.com authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
```
  122167bb
- Merge mysql.com:/home/svoj/devel/bk/mysql-4.1 · a4ddc226
  svoj@mysql.com/june.mysql.com authored May 23, 2007
```
into  mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
```
  a4ddc226
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · f8433465
  df@pippilotta.erinye.com authored May 23, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  f8433465
22 May, 2007 9 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 2ff938d2
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  2ff938d2
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb · b7894527
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  b7894527
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · a4934466
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  a4934466
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 481b314e
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  481b314e
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-4.1 · 7b2c430f
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
```
  7b2c430f
- Merge trift2.:/MySQL/M50/bug26609-5.0 · b8e3fb13
  joerg@trift2. authored May 22, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  b8e3fb13
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · 2c715f1a
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
  2c715f1a
- Bug #28593 cluster backup scans in acc index order, bad for disk data · b46c826a
  tomas@whalegate.ndb.mysql.com authored May 22, 2007
```
- change to scan in tup and disk order (if applicable)
```
  b46c826a
- Merge trift2.:/MySQL/M50/bug26609-5.0 · 49dc9c59
  joerg@trift2. authored May 22, 2007
```
into  trift2.:/MySQL/M51/bug26609-5.1
```
  49dc9c59