Commits · 33538223b6ee13d3b8f556b5566a913b19fd9e1f · Kirill Smelkov / mariadb

19 Oct, 2006 3 commits
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 33538223
  mskold/marty@linux.site authored Oct 19, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
  33538223
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 · b97dff67
  mskold/marty@mysql.com/linux.site authored Oct 19, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
```
  b97dff67
- Bug #21072 Duplicate key error in NDB references wrong key: use MAX_KEY to... · 240cd87d
  mskold/marty@mysql.com/linux.site authored Oct 19, 2006
```
Bug #21072  Duplicate key error in NDB references wrong key: use MAX_KEY to signal unknown key: Added string initialization
```
  240cd87d
17 Oct, 2006 1 commit
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · ad7f7fee
  mskold/marty@linux.site authored Oct 17, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
  ad7f7fee
16 Oct, 2006 8 commits
- Merge dator5.(none):/home/pappa/clean-mysql-5.1 · 4a7cd3a1
  mikael/pappa@dator5.(none) authored Oct 16, 2006
```
into  dator5.(none):/home/pappa/bug18198
```
  4a7cd3a1
- Bug #21072 Duplicate key error in NDB references wrong key: Added new... · 9aeeda73
  mskold/marty@mysql.com/linux.site authored Oct 16, 2006
```
 Bug #21072  Duplicate key error in NDB references wrong key: Added new printout for duplicate key error when key is unknown
```
  9aeeda73
- Bug #21072 Duplicate key error in NDB references wrong key: Added new... · 18d2e733
  mskold/marty@mysql.com/linux.site authored Oct 16, 2006
```
 Bug #21072  Duplicate key error in NDB references wrong key: Added new printout for duplicate key error when key is unknown
```
  18d2e733
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 7e682728
  mskold/marty@linux.site authored Oct 16, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
  7e682728
- Bug #21072 Duplicate key error in NDB references wrong key: re-generated test results · fc1286e3
  mskold/marty@mysql.com/linux.site authored Oct 16, 2006
  
  fc1286e3
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 2c0208a4
  mskold/marty@linux.site authored Oct 16, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
```
  2c0208a4
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 · e7f69b42
  mskold/marty@mysql.com/linux.site authored Oct 16, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
```
  e7f69b42
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 · aafe6e46
  mskold/marty@mysql.com/linux.site authored Oct 16, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
```
  aafe6e46
13 Oct, 2006 3 commits
- Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real · e6be42e1
  kroki/tomash@moonlight.intranet authored Oct 13, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real
```
  e6be42e1
- Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678 · 62a697aa
  kroki/tomash@moonlight.intranet authored Oct 13, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real
```
  62a697aa
- Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.0 · ec523c65
  kroki/tomash@moonlight.intranet authored Oct 13, 2006
```
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678
```
  ec523c65
11 Oct, 2006 5 commits
- Raise version number · 2af5c98d
  bteam/mysqldev@mysql.com/production.mysql.com authored Oct 11, 2006
  
  2af5c98d
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 43f994c4
  msvensson@neptunus.(none) authored Oct 11, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  43f994c4
- Merge bk-internal:/home/bk/mysql-5.1-rpl · 5b247808
  msvensson@neptunus.(none) authored Oct 11, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  5b247808
- Merge bk-internal:/home/bk/mysql-5.0-rpl · 2c7ef3eb
  msvensson@neptunus.(none) authored Oct 11, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  2c7ef3eb
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · ed250c17
  msvensson@neptunus.(none) authored Oct 11, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  ed250c17
10 Oct, 2006 14 commits
- Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl · 0b4e65e1
  lars@black.(none) authored Oct 10, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
```
  0b4e65e1
- Merge mysql.com:/home/bkroot/mysql-5.0-rpl · f28e9eb6
  lars@mysql.com/black.(none) authored Oct 10, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
```
  f28e9eb6
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 84e4df33
  jonas@perch.ndb.mysql.com authored Oct 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  84e4df33
- ndb - · 94b8e561
  jonas@perch.ndb.mysql.com authored Oct 10, 2006
```
  ndb_restore Return OK even if temporary errors
    (otherwise mysql-test-run/ndb_restore can fail on really slow machines)
```
  94b8e561
- Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · 1023aecb
  mats@romeo.(none) authored Oct 10, 2006
```
into  romeo.(none):/home/bk/b21474-mysql-5.1-new-rpl
```
  1023aecb
- BUG#21474 (There is a rotation before the last table map): · 6c3b1f6e
  mats@romeo.(none) authored Oct 10, 2006
```
Removing code to step the group log position and just stepping
the event log position.  If the group log position were stepped
one time too many, it might be that the group starts at a position
that is not possible, e.g., at a Rows_log_event, or between an
Intvar_log_event and the following associated Query_log_event.
```
  6c3b1f6e
- Fixes to make replication team tree build on Windows. · 799585c5
  mats@romeo.(none) authored Oct 10, 2006
  
  799585c5
- Merge trift2.:/MySQL/M50/clone-5.0 · c1e351ab
  joerg@trift2. authored Oct 10, 2006
```
into  trift2.:/MySQL/M50/push-5.0
```
  c1e351ab
- Fix to make it build on all platforms. · 0b6ff112
  mats@romeo.(none) authored Oct 10, 2006
```
Replacing C++ code with C code in a C file.
```
  0b6ff112
- Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 · e600a3d3
  jonas@perch.ndb.mysql.com authored Oct 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  e600a3d3
- Merge perch.ndb.mysql.com:/home/jonas/src/51-work · fe61968d
  jonas@perch.ndb.mysql.com authored Oct 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
  fe61968d
- Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 5590e99d
  jonas@perch.ndb.mysql.com authored Oct 10, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/51-work
```
  5590e99d
- ndb - bug#23107 · c3017359
  jonas@perch.ndb.mysql.com authored Oct 10, 2006
```
  fix bug in test prg
```
  c3017359
- ndb - bug#23107 · d25765d1
  jonas@perch.ndb.mysql.com authored Oct 10, 2006
```
  fix bug in handling of inactive timeout for scan, when all is delivered
```
  d25765d1
09 Oct, 2006 1 commit
- Post-merge fixes. · b8941bbc
  mats@romeo.(none) authored Oct 09, 2006
  
  b8941bbc
08 Oct, 2006 5 commits
- Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0 · 7683b297
  svoj@mysql.com/april.(none) authored Oct 08, 2006
```
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
```
  7683b297
- Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines · cab855ca
  svoj@april.(none) authored Oct 08, 2006
```
into  mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
```
  cab855ca
- After merge fix. · 08304868
  svoj@mysql.com/april.(none) authored Oct 08, 2006
  
  08304868
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · 0ea6959d
  svoj@may.pils.ru authored Oct 08, 2006
```
into  may.pils.ru:/home/svoj/devel/bk/mysql-5.1-engines
```
  0ea6959d
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8cfef42f
  svoj@may.pils.ru authored Oct 08, 2006
```
into  may.pils.ru:/home/svoj/devel/bk/mysql-5.0-engines
```
  8cfef42f