Commits · 6b45a0b704017ccef46a4e2844d7cc30b8735c20 · Kirill Smelkov / mariadb

10 Feb, 2006 30 commits
- Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6b45a0b7
  jmiller@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
  6b45a0b7
- Merge mysql.com:/home/cps/mysql/devel/5.0-mike · 2e01c8b0
  petr@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-merge
```
  2e01c8b0
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · 0ec372ed
  tomas@poseidon.ndb.mysql.com authored Feb 10, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  0ec372ed
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · f0d95d0a
  tomas@poseidon.ndb.mysql.com authored Feb 10, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  f0d95d0a
- manual merge · 5ba3f69f
  tomas@poseidon.ndb.mysql.com authored Feb 10, 2006
  
  5ba3f69f
- Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · 27a14f93
  tomas@poseidon.ndb.mysql.com authored Feb 10, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
```
  27a14f93
- Bug #17249 ndb, delete statement with join where clause fails when table do not have pk · 7050a758
  tomas@poseidon.ndb.mysql.com authored Feb 10, 2006
```
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
```
  7050a758
- Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0cf61d62
  jmiller@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
  0cf61d62
- test updates · 7ce37121
  jmiller@mysql.com authored Feb 10, 2006
  
  7ce37121
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · b6b6da9f
  petr@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.0-mike
```
  b6b6da9f
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 332a1a1f
  msvensson@neptunus.(none) authored Feb 10, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  332a1a1f
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · fe87e347
  petr@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.0-mike
```
  fe87e347
- Merge mysql.com:/usr/local/mysql/mysql-5.1-sp-destruct · 344c3341
  knielsen@mysql.com authored Feb 10, 2006
```
into  mysql.com:/usr/local/mysql/mysql-5.1-new
```
  344c3341
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7d34d2f4
  jonas@perch.ndb.mysql.com authored Feb 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  7d34d2f4
- Fix missing test cleanup · 1bc91adc
  knielsen@mysql.com authored Feb 10, 2006
  
  1bc91adc
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · af875527
  jonas@perch.ndb.mysql.com authored Feb 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  af875527
- merge · 0c559223
  jonas@perch.ndb.mysql.com authored Feb 10, 2006
  
  0c559223
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · b8d64346
  jonas@perch.ndb.mysql.com authored Feb 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  b8d64346
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 7a490207
  jonas@perch.ndb.mysql.com authored Feb 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
```
  7a490207
- Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 3e312142
  jonas@perch.ndb.mysql.com authored Feb 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/50-work
```
  3e312142
- bug#10987 - ndb - unable to find restorable replica · 088c7d42
  jonas@perch.ndb.mysql.com authored Feb 10, 2006
```
  Introduce new variable c_newest_restorable_gci
    which is set _after_ both GCP_SAVE and COPY_GCI
    
  This variable is used when cutting redo (calcKeepGci)
  
  Also make sure complete GCI is run inbetween LCP's
```
  088c7d42
- Merge perch.ndb.mysql.com:/home/jonas/src/41-work · 84ed332f
  jonas@perch.ndb.mysql.com authored Feb 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/50-work
```
  84ed332f
- bug#17295 - ndb - error while reading REDO log · d9e402ef
  jonas@perch.ndb.mysql.com authored Feb 10, 2006
```
  fix corruption due to page 0, file 0 gets released
```
  d9e402ef
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5690dd8b
  msvensson@neptunus.(none) authored Feb 10, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  5690dd8b
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f037d477
  petr@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.0-mike
```
  f037d477
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · c5794763
  petr@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
```
  c5794763
- Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 9ea857d0
  ramil@mysql.com authored Feb 10, 2006
```
into  mysql.com:/usr/home/ram/work/5.0.b16511
```
  9ea857d0
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f3d73e8c
  petr@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-im-fixes
```
  f3d73e8c
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 392f93c0
  petr@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-utf-bug
```
  392f93c0
- IM changes by GUI team: add a version_no column to the · 84884985
  petr@mysql.com authored Feb 10, 2006
```
SHOW INSTANCE STATUS output
```
  84884985
09 Feb, 2006 10 commits
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5bb07f7e
  tomas@poseidon.ndb.mysql.com authored Feb 10, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  5bb07f7e
- a bunch of IM fixes from the GUI team · 1c7bc085
  petr@mysql.com authored Feb 10, 2006
  
  1c7bc085
- changed to use temporary heap table on a ndb test · 76f6331a
  tomas@poseidon.ndb.mysql.com authored Feb 10, 2006
```
corrected multiple --log-bin options in mysql-test-run
```
  76f6331a
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · fe0ff3e2
  tomas@poseidon.ndb.mysql.com authored Feb 09, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  fe0ff3e2
- remove volatile. fixes windows build · 0aced4da
  andrey@lmy004. authored Feb 09, 2006
```
WL#1034 (Internal CRON)
```
  0aced4da
- from fix for bug#16414 (Events: Crash or hang if event drops itself) · 541e6734
  andrey@lmy004. authored Feb 09, 2006
```
WL #1034 
```
  541e6734
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 246d0ea2
  tomas@poseidon.ndb.mysql.com authored Feb 09, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  246d0ea2
- Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 24c01089
  andrey@lmy004. authored Feb 09, 2006
```
into lmy004.:/work/mysql-5.1-events_i_s
```
  24c01089
- Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f8f8af97
  aivanov@mysql.com authored Feb 10, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-merged
```
  f8f8af97
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 930641a5
  tomas@poseidon.ndb.mysql.com authored Feb 09, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  930641a5