Commits · 294ab4c62a6a58e5e644ab0f255463789a22be6e · Kirill Smelkov / mariadb

29 Nov, 2007 6 commits
- Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build · 294ab4c6
  kent@kent-amd64.(none) authored Nov 29, 2007
```
into  mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.1-build
```
  294ab4c6
- Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-4.1-build · c0b8aa41
  kent@kent-amd64.(none) authored Nov 29, 2007
```
into  mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build
```
  c0b8aa41
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3214b7c2
  kent@kent-amd64.(none) authored Nov 29, 2007
```
into  mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-build
```
  3214b7c2
- my_global.h: · 369d75dc
  kent@mysql.com/kent-amd64.(none) authored Nov 29, 2007
```
  Added 64 bit Mac OS X hard coded settings, for universal binaries
```
  369d75dc
- Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0 · a8504f68
  jonathan@chorlton.adsl.perkin.org.uk authored Nov 29, 2007
```
into  chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.1
```
  a8504f68
- Shell portability fix. · 247a84d4
  jonathan@chorlton.adsl.perkin.org.uk authored Nov 29, 2007
  
  247a84d4
28 Nov, 2007 9 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 45307504
  df@pippilotta.erinye.com authored Nov 28, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  45307504
- use --builddir option for mysql_install_db · 5f21a18f
  df@pippilotta.erinye.com authored Nov 28, 2007
  
  5f21a18f
- fix make distcheck in a different way · 69ae57ae
  df@pippilotta.erinye.com authored Nov 28, 2007
  
  69ae57ae
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 8765858d
  df@pippilotta.erinye.com authored Nov 28, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  8765858d
- include data files for parts test suite in distribution · 24b4226f
  df@pippilotta.erinye.com authored Nov 28, 2007
  
  24b4226f
- Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 1a87a089
  istruewing@stella.local authored Nov 28, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  1a87a089
- Bug#8693 Test 'rpl_log_pos' fails sometimes · 4d38a046
  istruewing@stella.local authored Nov 28, 2007
```
Moved disabling to rpl suite.
Bug#32801 wait_timeout.test fails randomly
Disabled test case.
```
  4d38a046
- Bug#29149 Test "kill" fails on Windows · 02e321d3
  istruewing@stella.local authored Nov 28, 2007
```
Disabled test case.
```
  02e321d3
- Cset exclude: tsmith@ramayana.hindu.god|ChangeSet|20071127191535|13686 · 4f16ab2e
  tsmith@ramayana.hindu.god authored Nov 27, 2007
```
This change isn't correct, and the correct one will be pulled in from another
repository.
```
  4f16ab2e
27 Nov, 2007 17 commits
- Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 63e48ec2
  istruewing@stella.local authored Nov 27, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  63e48ec2
- Fix possible use of uninitialized variable during error handling in mysql.cc · 44ba2ae7
  tsmith@ramayana.hindu.god authored Nov 27, 2007
  
  44ba2ae7
- Merge stella.local:/home2/mydev/mysql-5.1-amain · da28f9ea
  istruewing@stella.local authored Nov 27, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  da28f9ea
- Merge stella.local:/home2/mydev/mysql-5.0-ateam · 777d79f5
  istruewing@stella.local authored Nov 27, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  777d79f5
- after-merge fixup: archive test/result adjusted. · e2fa11fb
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Nov 27, 2007
  
  e2fa11fb
- Merge stella.local:/home2/mydev/mysql-5.0-ateam · c389535a
  istruewing@stella.local authored Nov 27, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  c389535a
- Bug#8693 Test 'rpl_log_pos' fails sometimes · a167dd0b
  istruewing@stella.local authored Nov 27, 2007
```
Disabled the test case.
```
  a167dd0b
- Merge mysql.com:/home/ram/work/mysql-5.0-engines · f03fb473
  ramil/ram@ramil.myoffice.izhnet.ru authored Nov 27, 2007
```
into  mysql.com:/home/ram/work/b30495/b30495.5.0
```
  f03fb473
- Merge mysql.com:/home/ram/work/mysql-5.1-engines · 43447858
  ramil/ram@ramil.myoffice.izhnet.ru authored Nov 27, 2007
```
into  mysql.com:/home/ram/work/b30495/b30495.5.1
```
  43447858
- Merge stella.local:/home2/mydev/mysql-5.0-amain · a39180c1
  istruewing@stella.local authored Nov 27, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  a39180c1
- Merge hh-nb.hhunger:/work/trees/mysql-5.0-build-src-clean · cb33d0dc
  hhunger@hh-nb.hhunger authored Nov 27, 2007
```
into  hh-nb.hhunger:/work/merge/mysql-5.0-build
```
  cb33d0dc
- Merge hh-nb.hhunger:/work/trees/mysql-5.1-build-src-clean · ab12b266
  hhunger@hh-nb.hhunger authored Nov 27, 2007
```
into  hh-nb.hhunger:/work/merge/mysql-5.1-build
```
  ab12b266
- Merge mysql.com:/home/ram/work/mysql-5.0-engines · 14e74e82
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Nov 27, 2007
```
into  mysql.com:/home/ram/work/b30495/b30495.5.0
```
  14e74e82
- Disabling several tests that fail and reported as errors. · b1428496
  mkindahl@dl145h.mysql.com authored Nov 27, 2007
  
  b1428496
- after-merge fix: · d20dcd24
  ramil/ram@mysql.com/ramil.myoffice.izhnet.ru authored Nov 27, 2007
```
  - archive test/result adjusted.
  - OPTIMIZE/ANALYZE PARTITION EXTENDED test case added.
```
  d20dcd24
- Bug#32754 - InnoDB tests do not prepare or clean up correctly · 13f317c5
  istruewing@stella.local authored Nov 27, 2007
```
Some test cases were missing preparation to deal with failed
predecessor test cases.

Added preparation (drop table if exists) to some test cases.
```
  13f317c5
- Merge mysql.com:/home/ram/work/b30495/b30495.5.0 · 32f9164b
  ramil/ram@ramil.myoffice.izhnet.ru authored Nov 27, 2007
```
into  mysql.com:/home/ram/work/b30495/b30495.5.1
```
  32f9164b
26 Nov, 2007 8 commits
- post merge fix for bug#32496. · aa30bc51
  hhunger@hh-nb.hhunger authored Nov 26, 2007
  
  aa30bc51
- Merge hh-nb.hhunger:/work/merge/mysql-5.0-32496 · a075c705
  hhunger@hh-nb.hhunger authored Nov 26, 2007
```
into  hh-nb.hhunger:/work/merge/mysql-5.1-32496
```
  a075c705
- patch for bug#32496 (2nd) with ansi conformant and Mysql test case. · 10ea2aa9
  hhunger@hh-nb.hhunger authored Nov 26, 2007
  
  10ea2aa9
- Remove disabling of testcases · ec08b4a4
  msvensson@pilot.mysql.com authored Nov 26, 2007
  
  ec08b4a4
- Bug#25146 Some warnings/errors not shown when using --show-warnings · f45cf3e9
  msvensson@pilot.mysql.com authored Nov 26, 2007
```
 - Additional patch to fix compiler warnings
```
  f45cf3e9
- Revert · 385e3a89
  msvensson@pilot.mysql.com authored Nov 26, 2007
  
  385e3a89
- Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 7fcf4940
  istruewing@stella.local authored Nov 26, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  7fcf4940
- Bug#20830 - INSERT DELAYED does not honour SET INSERT_ID · f140e7e0
  istruewing@stella.local authored Nov 26, 2007
```
Bug#20627 - INSERT DELAYED does not honour auto_increment_* variables
Fixed wrong variable assignment.
```
  f140e7e0