Commits · 2711af699c6f3078ba19daf18fb0b7e2878c0c4c · nexedi / MariaDB

30 Jun, 2006 1 commit
- 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
29 Jun, 2006 16 commits
- 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 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/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
28 Jun, 2006 23 commits
- 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 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
- 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
- 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
- Disabled test case for Windows (BUG#20753) · 38501d88
  lars@mysql.com authored Jun 28, 2006
  
  38501d88
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 1cc537d9
  stewart@willster.(none) authored Jun 28, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/5.1/bug20725
```
  1cc537d9
- BUG#20739 · e8df7d43
  knielsen@mysql.com authored Jun 28, 2006
```
Improved definition of mysys configuration for -nt builds.
```
  e8df7d43
- Merge mysql.com:/home/stewart/Documents/MySQL/5.1/ndb · c19578fb
  stewart@willster.(none) authored Jun 28, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge
```
  c19578fb
- Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge · e5567d84
  stewart@willster.(none) authored Jun 28, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/5.1/merge
```
  e5567d84
- Merge mysql.com:/home/stewart/Documents/MySQL/4.1/merge · bfda9249
  stewart@mysql.com authored Jun 28, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/5.0/merge
```
  bfda9249
- BUG#19894 Data nodes fail during loading data if NoOfFragmentLogFiles=1 · 3d01caa9
  stewart@mysql.com authored Jun 28, 2006
```
change default minimum to 3

bug is *very* timing dependent, unable to reproduce here, but theoretically possible.
```
  3d01caa9
- BUG#20739: __NT__ not probably defined for mysys project. · 529a2d12
  knielsen@mysql.com authored Jun 28, 2006
```
Make sure for the mysys project that __NT__ is defined in *nt solution
configurations (but not in other configurations).
```
  529a2d12
- Adding __NT__ to Max Win32 configuration. · c18a4e36
  aivanov@mysql.com authored Jun 28, 2006
  
  c18a4e36
- ndb - · f54b1e0d
  jonas@perch.ndb.mysql.com authored Jun 28, 2006
```
  50->51 merge of bug#20442, force close scan (with locks)
```
  f54b1e0d
- ndb - · ff2528f3
  jonas@perch.ndb.mysql.com authored Jun 28, 2006
```
  ndbapi test of bug#20252
```
  ff2528f3
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 7f307660
  jonas@perch.ndb.mysql.com authored Jun 28, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  7f307660