Commits · ea8ba0355651d52f692a34a63cde87b412629c52 · Kirill Smelkov / mariadb

19 Oct, 2006 1 commit
- Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1 · ea8ba035
  gkodinov@dl145s.mysql.com authored Oct 19, 2006
```
into  dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
```
  ea8ba035
18 Oct, 2006 1 commit
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt · 9aa346bb
  holyfoot/hf@deer.(none) authored Oct 18, 2006
```
into  mysql.com:/home/hf/mysql-5.1.mrg
```
  9aa346bb
16 Oct, 2006 1 commit
- 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
13 Oct, 2006 4 commits
- merging · 76bc3e2e
  holyfoot/hf@mysql.com/deer.(none) authored Oct 13, 2006
  
  76bc3e2e
- 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
12 Oct, 2006 2 commits
- Merge mysql.com:/home/hf/mysql-5.0.mrg · 06978991
  holyfoot/hf@deer.(none) authored Oct 12, 2006
```
into  mysql.com:/home/hf/mysql-5.1.mrg
```
  06978991
- Merge bk@192.168.21.1:mysql-4.1 · edc90268
  holyfoot/hf@mysql.com/deer.(none) authored Oct 12, 2006
```
into  mysql.com:/home/hf/mysql-5.0.mrg
```
  edc90268
11 Oct, 2006 6 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 bk-internal:/home/bk/mysql-4.1-rpl · 5dded174
  msvensson@neptunus.(none) authored Oct 11, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
  5dded174
- 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 15 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 mysql.com:/home/bkroot/mysql-4.1-rpl · 89b1b45b
  lars@mysql.com/black.(none) authored Oct 10, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
```
  89b1b45b
- 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 6 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
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1 · b7f016db
  svoj@may.pils.ru authored Oct 08, 2006
```
into  may.pils.ru:/home/svoj/devel/bk/mysql-4.1-engines
```
  b7f016db
06 Oct, 2006 3 commits
- Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl · d4d26ba7
  mats@romeo.(none) authored Oct 06, 2006
```
into  romeo.(none):/home/bk/b19459-mysql-5.1-new
```
  d4d26ba7
- Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-engines · 1b5c111c
  svoj@april.(none) authored Oct 06, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.1-engines
```
  1b5c111c
- Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-engines · 8f4b0d94
  svoj@mysql.com/april.(none) authored Oct 06, 2006
```
into  mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-engines
```
  8f4b0d94