Commits · d0d1eb770cd433051afbddd2a95cd1293146be90 · nexedi / MariaDB

21 Feb, 2007 3 commits
- Merge... · d0d1eb77
  tomas@poseidon.mysql.com authored Feb 21, 2007
```
Merge mysqldev@production.mysql.com:/data0/mysqldev/my/build-200702202011-5.1.16-beta/mysql-5.1-release
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  d0d1eb77
- fix c++ syntac in c file · dd323982
  tomas@poseidon.mysql.com authored Feb 21, 2007
  
  dd323982
- Bug #26490 duplicate cluster error code · 6cbc6d91
  tomas@poseidon.mysql.com authored Feb 21, 2007
```
- fixed error code
- added test program run in mysql-test-run bk version
```
  6cbc6d91
20 Feb, 2007 4 commits
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · e9d70980
  istruewing@chilla.local authored Feb 20, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  e9d70980
- Fixed a bad merge. Got a duplicate symbol on OSX. · 0f4a84f0
  istruewing@chilla.local authored Feb 20, 2007
  
  0f4a84f0
- A few minor cleanups for recent AbortOption behaviour change. · 6db8fef5
  knielsen@ymer.(none) authored Feb 20, 2007
  
  6db8fef5
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 5d37bbee
  jonas@perch.ndb.mysql.com authored Feb 20, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  5d37bbee
19 Feb, 2007 13 commits
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 1d99e609
  jonas@perch.ndb.mysql.com authored Feb 20, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  1d99e609
- fix compile error in testBitfield · 8801e8e7
  jonas@perch.ndb.mysql.com authored Feb 20, 2007
  
  8801e8e7
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 9bc35034
  jonas@perch.ndb.mysql.com authored Feb 19, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  9bc35034
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · f2e2e7a6
  jonas@perch.ndb.mysql.com authored Feb 19, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  f2e2e7a6
- ndb - fix correct argv/argc handling in testBitfield · a51d58e6
  jonas@perch.ndb.mysql.com authored Feb 19, 2007
  
  a51d58e6
- ndb - · f0253235
  jonas@perch.ndb.mysql.com authored Feb 19, 2007
```
  forgott to add testcase for bug#26481
```
  f0253235
- Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · e882e4f6
  jonas@perch.ndb.mysql.com authored Feb 19, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  e882e4f6
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 6c54eccd
  jonas@perch.ndb.mysql.com authored Feb 19, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
```
  6c54eccd
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · f6dd9362
  jonas@perch.ndb.mysql.com authored Feb 19, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  f6dd9362
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 20c8b292
  jonas@perch.ndb.mysql.com authored Feb 19, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  20c8b292
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 1cfd066e
  jonas@perch.ndb.mysql.com authored Feb 19, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  1cfd066e
- ndb - bug#26481 · 4c3fef3a
  jonas@perch.ndb.mysql.com authored Feb 19, 2007
```
  fix for killed node during initial node restart
```
  4c3fef3a
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · c0a2c118
  tomas@poseidon.mysql.com authored Feb 19, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  c0a2c118
17 Feb, 2007 4 commits
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 44fa3eaa
  jonas@perch.ndb.mysql.com authored Feb 18, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  44fa3eaa
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 4d80c3f6
  jonas@perch.ndb.mysql.com authored Feb 17, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  4d80c3f6
- ndb - bug#26457 · 2cff674c
  jonas@perch.ndb.mysql.com authored Feb 17, 2007
```
  master failure during master take over
```
  2cff674c
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 53cc4c33
  tomas@poseidon.mysql.com authored Feb 17, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  53cc4c33
16 Feb, 2007 16 commits
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 44f1c624
  jonas@perch.ndb.mysql.com authored Feb 16, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  44f1c624
- Merge localhost:/home/jonas/src/51-work · f65af74a
  jonas@eel.(none) authored Feb 16, 2007
```
into  eel.(none):/home/jonas/src/51-work
```
  f65af74a
- ndb - atrt minor fixes · c46900c1
  jonas@eel.(none) authored Feb 16, 2007
  
  c46900c1
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 05f90ebc
  jonas@perch.ndb.mysql.com authored Feb 16, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  05f90ebc
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 10153653
  jonas@perch.ndb.mysql.com authored Feb 16, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  10153653
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 3d04728e
  jonas@perch.ndb.mysql.com authored Feb 16, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  3d04728e
- ndb - bug in my.cnf handling on resize of vector · 80b82d2b
  jonas@perch.ndb.mysql.com authored Feb 16, 2007
```
  backport fix from 5.1
```
  80b82d2b
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 62e52c49
  jonas@perch.ndb.mysql.com authored Feb 16, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  62e52c49
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · d1026838
  jonas@perch.ndb.mysql.com authored Feb 16, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  d1026838
- ndb - bug#26454 · 77b8feb8
  jonas@perch.ndb.mysql.com authored Feb 16, 2007
```
  make lockpages=1 run a bit earlier in startup
```
  77b8feb8
- Merge chilla.local:/home/mydev/mysql-5.0-axmrg · db692e7f
  istruewing@chilla.local authored Feb 16, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  db692e7f
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · e266bc29
  istruewing@chilla.local authored Feb 16, 2007
```
into  chilla.local:/home/mydev/mysql-5.1-axmrg
```
  e266bc29
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 97c6a6c4
  istruewing@chilla.local authored Feb 16, 2007
```
into  chilla.local:/home/mydev/mysql-5.0-axmrg
```
  97c6a6c4
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · a25431a9
  tomas@poseidon.mysql.com authored Feb 16, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
  a25431a9
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 80fe0fe4
  jonas@perch.ndb.mysql.com authored Feb 16, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  80fe0fe4
- ndb - autotest · 685423e5
  jonas@eel.(none) authored Feb 16, 2007
```
  increase timeout on slow test
```
  685423e5