Commits · 10b082f02a1e282ad523ca8105f3bbb176fe8b94 · Kirill Smelkov / mariadb

07 Nov, 2006 2 commits
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 10b082f0
  jonas@perch.ndb.mysql.com authored Nov 07, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  10b082f0
- ndb - bug#24039 · 4bf35faa
  jonas@perch.ndb.mysql.com authored Nov 07, 2006
```
  Make sure index scan does not commitDelete
```
  4bf35faa
06 Nov, 2006 3 commits
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 15f996f3
  jonas@perch.ndb.mysql.com authored Nov 06, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  15f996f3
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · ebf4de96
  jonas@perch.ndb.mysql.com authored Nov 06, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  ebf4de96
- ndb - bug#24011 · c8d07748
  jonas@perch.ndb.mysql.com authored Nov 06, 2006
  
  c8d07748
01 Nov, 2006 1 commit
- Merge trift2.:/MySQL/M51/clone-5.1 · 0d27df6f
  joerg@trift2. authored Nov 01, 2006
```
into  trift2.:/MySQL/M51/push-5.1
```
  0d27df6f
31 Oct, 2006 2 commits
- Merge perch.ndb.mysql.com:/home/jonas/src/50-multi · b5e1d6f2
  jonas@perch.ndb.mysql.com authored Oct 31, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  b5e1d6f2
- ndb - ndb_multi spurious failure · c6308d65
  jonas@perch.ndb.mysql.com authored Oct 31, 2006
```
  remove timeing dependant part of test
```
  c6308d65
27 Oct, 2006 5 commits
- Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 · f6fcb302
  jonas@perch.ndb.mysql.com authored Oct 28, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  f6fcb302
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · a172a5dc
  jonas@perch.ndb.mysql.com authored Oct 27, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  a172a5dc
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · ebcc594e
  jonas@perch.ndb.mysql.com authored Oct 27, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  ebcc594e
- Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 4037a8d6
  jonas@perch.ndb.mysql.com authored Oct 27, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/50-work
```
  4037a8d6
- ndb - valgrind · 0cbb309b
  jonas@perch.ndb.mysql.com authored Oct 27, 2006
```
  Still leakage, make sure all unlinked operations are put back so they will be release
  (on failing blob operations, when AO_IgnoreError)
```
  0cbb309b
25 Oct, 2006 17 commits
- Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux · 0dac23f6
  pekka@orca.ndb.mysql.com authored Oct 25, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux
```
  0dac23f6
- ndb - dbtux: remove redundant code line (no functional change) · 00db3c99
  pekka@orca.ndb.mysql.com authored Oct 25, 2006
  
  00db3c99
- Bug #21072 Duplicate key error in NDB references wrong key: Re-wrote string... · bf365af0
  mskold/marty@mysql.com/linux.site authored Oct 25, 2006
```
Bug #21072  Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings
```
  bf365af0
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · c845b3e1
  mskold/marty@linux.site authored Oct 25, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  c845b3e1
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · c0ede464
  mskold/marty@linux.site authored Oct 25, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  c0ede464
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 6c8b9303
  mskold/marty@linux.site authored Oct 25, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
  6c8b9303
- Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · fb77211e
  stewart@willster.(none) authored Oct 25, 2006
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
```
  fb77211e
- post merge fixes (from merging test fixes from bug 19914) · 1f05ac4a
  stewart@willster.(none) authored Oct 25, 2006
  
  1f05ac4a
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 · 0dea2494
  mskold/marty@mysql.com/linux.site authored Oct 25, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
```
  0dea2494
- Bug #21072 Duplicate key error in NDB references wrong key: Re-wrote string... · 44e55e3b
  mskold/marty@mysql.com/linux.site authored Oct 25, 2006
```
Bug #21072  Duplicate key error in NDB references wrong key: Re-wrote string usage to avoid valgrind warnings
```
  44e55e3b
- Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp · e43c5fca
  knielsen@ymer.(none) authored Oct 25, 2006
```
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
```
  e43c5fca
- Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb · d5810cd0
  stewart@willster.(none) authored Oct 25, 2006
```
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
```
  d5810cd0
- Fix two small problems in the source, potentially causing user-visible · 44aa0f4d
  knielsen@ymer.(none) authored Oct 25, 2006
```
bugs.
```
  44aa0f4d
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · d9d7c785
  jonas@perch.ndb.mysql.com authored Oct 25, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  d9d7c785
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 5230dceb
  jonas@perch.ndb.mysql.com authored Oct 25, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  5230dceb
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 61f87f5d
  jonas@perch.ndb.mysql.com authored Oct 25, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  61f87f5d
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 6e4a0ec0
  jonas@perch.ndb.mysql.com authored Oct 25, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
```
  6e4a0ec0
24 Oct, 2006 6 commits
- Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb · 64c414a0
  pekka@orca.ndb.mysql.com authored Oct 24, 2006
```
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
```
  64c414a0
- Bug #23427: incompatible ABI change in 5.0.26? · da721fe7
  mmj@tiger.local[mmj] authored Oct 24, 2006
```
Revert 1 June change enough to restore ABI compatibility with previous
versions.
```
  da721fe7
- fix result file for ndb_multi · a8037f47
  stewart@willster.(none) authored Oct 25, 2006
  
  a8037f47
- fix ndb_cache_multi2 · dc38d024
  stewart@willster.(none) authored Oct 24, 2006
```
util thread wasn't behaving correctly after 241 error due to get_table_statistics
not properly returning an error code
```
  dc38d024
- bug#21873 MySQLD Crash on ALTER...ADD..UNIQUE..USING HASH statement for NDB... · 0067cd8a
  mskold/marty@mysql.com/linux.site authored Oct 24, 2006
```
bug#21873 MySQLD Crash on ALTER...ADD..UNIQUE..USING HASH statement for NDB backed table: Use passed key_info to check for nullable fields
```
  0067cd8a
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 8da80dd3
  mskold/marty@mysql.com/linux.site authored Oct 24, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  8da80dd3
23 Oct, 2006 4 commits
- post merge fix · 826628c9
  stewart@willster.(none) authored Oct 24, 2006
  
  826628c9
- Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2 · 3c2eeb2c
  stewart@willster.(none) authored Oct 23, 2006
```
into  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb
```
  3c2eeb2c
- Bug #19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tables · 5926602a
  stewart@willster.(none) authored Oct 23, 2006
```
fixes for ndb_* tests broken by previous fix

be more careful in ndb about setting errors on failure of info call (especially
in open) 
```
  5926602a
- Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2 · fc776db8
  stewart@willster.(none) authored Oct 23, 2006
```
into  willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2-merge2
```
  fc776db8