Commits · 88f816a0fd98803807b08c9ab986fcf81cac6f19 · Kirill Smelkov / mariadb

06 Jul, 2006 2 commits
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 88f816a0
  jonas@perch.ndb.mysql.com authored Jul 06, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  88f816a0
- ndb - revert bug fix for bug#20442 · f5ec695c
  jonas@perch.ndb.mysql.com authored Jul 06, 2006
  
  f5ec695c
04 Jul, 2006 1 commit
- Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new · 2f22f5aa
  jonas@perch.ndb.mysql.com authored Jul 04, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  2f22f5aa
30 Jun, 2006 9 commits
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 05f14b14
  jonas@perch.ndb.mysql.com authored Jun 30, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  05f14b14
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 75c9f3cd
  jonas@perch.ndb.mysql.com authored Jun 30, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  75c9f3cd
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 2711af69
  jonas@perch.ndb.mysql.com authored Jun 30, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  2711af69
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 · bc621b64
  jonas@perch.ndb.mysql.com authored Jun 30, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  bc621b64
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 8e11f6f5
  jonas@perch.ndb.mysql.com authored Jun 30, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  8e11f6f5
- Merge perch.ndb.mysql.com:/home/jonas/src/41-work · a4bfd318
  jonas@perch.ndb.mysql.com authored Jun 30, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/50-work
```
  a4bfd318
- ndb - bug#20774 · ab399277
  jonas@perch.ndb.mysql.com authored Jun 30, 2006
```
  crash if system restart with more than 4096 fragments
  solution: continueb enable expand check loop
```
  ab399277
- 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 23 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 perch.ndb.mysql.com:/home/jonas/src/51-work · ba1541c9
  jonas@perch.ndb.mysql.com authored Jun 29, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  ba1541c9
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · d7649bac
  jonas@perch.ndb.mysql.com authored Jun 29, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
```
  d7649bac
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 52e248a7
  jonas@perch.ndb.mysql.com authored Jun 29, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  52e248a7
- Merge perch.ndb.mysql.com:/home/jonas/src/41-work · a45f572d
  jonas@perch.ndb.mysql.com authored Jun 29, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/50-work
```
  a45f572d
- ndb - autotest · f4a095a3
  jonas@perch.ndb.mysql.com authored Jun 29, 2006
```
  Fix testNodeRestart -n DuringLCP and others (add stopTest() at end of test :-))
```
  f4a095a3
- 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
- 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 5 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