Commits · 1459784aba4bbf11fdc18d73ccc9f4cc735edbcd · Kirill Smelkov / mariadb

30 Jun, 2006 5 commits
- Reverted wrong bug fix (Bug#11228) · 1459784a
  evgen@moonbone.local authored Jul 01, 2006
  
  1459784a
- Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt · a989f726
  evgen@moonbone.local authored Jun 30, 2006
```
into moonbone.local:/work/merge-5.1
```
  a989f726
- Manual merge · adbd5fb1
  evgen@moonbone.local authored Jun 30, 2006
  
  adbd5fb1
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · b6559681
  petr@owlet. authored Jun 30, 2006
```
into  mysql.com:/home/cps/mysql/trees/5.1-team
```
  b6559681
- cleanup · c95ad615
  petr@mysql.com authored Jun 30, 2006
  
  c95ad615
29 Jun, 2006 20 commits
- fix test failures · 157cc569
  petr@mysql.com authored Jun 30, 2006
  
  157cc569
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 0b00ae6b
  monty@hasky.mysql.fi authored Jun 29, 2006
```
into  mysql.com:/home/my/mysql-5.1
```
  0b00ae6b
- Replaced assert with argument checking, as rpl_ndb_UUID caused slave to fail on x86 64 bit · 8eb9c06d
  monty@mysql.com authored Jun 29, 2006
```
(It failed even if test was marked as skipped)
```
  8eb9c06d
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 3b3dde6f
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  3b3dde6f
- corrected merge error · 5d67b052
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
  
  5d67b052
- manual merge · 9d902d4c
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
  
  9d902d4c
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 6fb6a105
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  6fb6a105
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main · 6f318d16
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  6f318d16
- Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error · 87460ec7
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
  
  87460ec7
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 35b7eb7e
  petr@owlet. authored Jun 29, 2006
```
into  mysql.com:/home/cps/mysql/trees/5.1-team
```
  35b7eb7e
- Fix Bug#20692 rpl_* tests failure on hpux · 4d76c28c
  petr@mysql.com authored Jun 29, 2006
  
  4d76c28c
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 42dfb7a8
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  42dfb7a8
- Merge mysql.com:/home/stewart/Documents/MySQL/5.1/bug17928 · c3010c24
  stewart@willster.(none) authored Jun 29, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/5.1/ndb
```
  c3010c24
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1 · f3d8d602
  lars@dl145k.mysql.com authored Jun 29, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  f3d8d602
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 019532a5
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  019532a5
- fixed too small requestInfo in signal · 0822e246
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
+ adopted signal to be as close as possible to 5.1...
```
  0822e246
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 0d22cc66
  tomas@poseidon.ndb.mysql.com authored Jun 29, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  0d22cc66
- Merge mysql.com:/home/kgeorge/mysql/4.1/warnings · 34473749
  gkodinov@mysql.com authored Jun 29, 2006
```
into  mysql.com:/home/kgeorge/mysql/5.0/warnings
```
  34473749
- Merge mysql.com:/home/kgeorge/mysql/4.1/teamclean · 9dbb0918
  gkodinov@mysql.com authored Jun 29, 2006
```
into  mysql.com:/home/kgeorge/mysql/4.1/warnings
```
  9dbb0918
- Fixed failing test rpl_ndb_auto_inc.test · 3f22bc07
  monty@mysql.com authored Jun 29, 2006
```
Mark events_stress.test as 'big' as it's very slow on some machines
```
  3f22bc07
28 Jun, 2006 15 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 7b0f8635
  monty@narttu.mysql.fi authored Jun 29, 2006
```
into  mysql.com:/home/my/mysql-5.1
```
  7b0f8635
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 3ad6ad75
  evgen@moonbone.local authored Jun 28, 2006
```
into moonbone.local:/home/evgen/mysql-5.1-new
```
  3ad6ad75
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 91c3e28d
  monty@narttu.mysql.fi authored Jun 28, 2006
```
into  mysql.com:/home/my/mysql-5.1
```
  91c3e28d
- Merge xiphis.org:/home/antony/work2/p4-bug12096.3 · 9d99e180
  acurtis@ltamd64.xiphis.org authored Jun 28, 2006
```
into  xiphis.org:/home/antony/work2/p4-bug12096.3-merge
```
  9d99e180
- Manual merge · 82369c4e
  evgen@moonbone.local authored Jun 28, 2006
  
  82369c4e
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 470087cb
  tomas@poseidon.ndb.mysql.com authored Jun 28, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  470087cb
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 63c72dc0
  tomas@poseidon.ndb.mysql.com authored Jun 28, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  63c72dc0
- Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge · 315ae8f4
  lars@dl145k.mysql.com authored Jun 28, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  315ae8f4
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · d4f79435
  lars@dl145k.mysql.com authored Jun 28, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
```
  d4f79435
- Added -DHAVE_MUTEX_THREAD_ONLY to fix that bdb doesn't crash with "unable to initialize mutex" · 500dd048
  monty@mysql.com authored Jun 28, 2006
  
  500dd048
- Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0-rpl · 6036c30b
  lars@mysql.com authored Jun 28, 2006
```
into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
```
  6036c30b
- Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl · 00fc05ff
  lars@dl145k.mysql.com authored Jun 28, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
```
  00fc05ff
- gcc 4.1 linux warning fixes backported from 5.0. · 96ceb6c2
  gkodinov@mysql.com authored Jun 28, 2006
  
  96ceb6c2
- Merge mysql.com:/users/lthalmann/bk/mysql-5.0-rpl · c75584d8
  lars@mysql.com authored Jun 28, 2006
```
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
```
  c75584d8
- BUG#20739. · 10abc3e2
  knielsen@mysql.com authored Jun 28, 2006
```
In the Windows build files, the "Max nt" configuration for some reason
had the mysql_client_test project disabled. Enable it.
```
  10abc3e2