Commits · 70488d7dfe70ca9834d54cd8d034554340686594 · nexedi / MariaDB

30 Oct, 2007 1 commit
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1 · 70488d7d
  bar@bar.myoffice.izhnet.ru authored Oct 30, 2007
```
into  mysql.com:/home/bar/mysql-work/mysql-5.1-new-rpl-merge
```
  70488d7d
29 Oct, 2007 1 commit
- Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1 · e3f77622
  gluh@eagle.(none) authored Oct 29, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  e3f77622
25 Oct, 2007 3 commits

Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl · c1f751ba
aelkin/elkin@koti.dsl.inet.fi authored Oct 25, 2007
```
into  koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug30594-rpl.rpl_skip_error_is_nondeterministic
```
c1f751ba
Mimic a rename which Daniel already did in 6.0, · 00ca6476
joerg@trift2. authored Oct 25, 2007
```
to get rid of a name clash among *deleted* files on case-insignificant file systems.
```
00ca6476

WL#4078: Document binary format of binlog entries · af7da8cd

sven@murkla.(none) authored Oct 25, 2007

Documented some binlog events using doxygen. More will be done later.
Also fixed typos in other comments and added remarks about dubious code.
Only comments are affected, there is no change to the actual code.

af7da8cd

24 Oct, 2007 3 commits
- Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl · 71bd1522
  mats@kindahl-laptop.dnsalias.net authored Oct 24, 2007
```
into  kindahl-laptop.dnsalias.net:/home/bk/b24860-mysql-5.1-rpl
```
  71bd1522
- BUG#31702 (Missing row on slave causes assertion failure under row-based · b9de3ce2
  mats@kindahl-laptop.dnsalias.net authored Oct 24, 2007
```
replication):

Incremental patch to enable idempotency support for update events again.
The final handling of errors will be done in BUG#31609, and until then
the handling of errors should be consistent between the different types
of changes.
```
  b9de3ce2
- result fix · 97e0180b
  gluh@mysql.com/eagle.(none) authored Oct 24, 2007
  
  97e0180b
23 Oct, 2007 32 commits
- result fix · b2aeda76
  gluh@mysql.com/eagle.(none) authored Oct 23, 2007
  
  b2aeda76
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · d6397390
  gluh@eagle.(none) authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  d6397390
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · 53b1c3a2
  gluh@eagle.(none) authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  53b1c3a2
- after merge fix · 1d42094d
  gluh@mysql.com/eagle.(none) authored Oct 23, 2007
  
  1d42094d
- Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 17acda6c
  gluh@eagle.(none) authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  17acda6c
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 237383f0
  gluh@eagle.(none) authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  237383f0
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 331ee712
  gluh@eagle.(none) authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt
```
  331ee712
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · d0f53297
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
  d0f53297
- Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt · 17310895
  kaa@polly.(none) authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
  17310895
- Merge mysql.com:/home/hf/work/30638/my50-30638 · f71a1441
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
  f71a1441
- Merge polly.(none):/home/kaa/src/opt/mysql-5.0-opt · 6f1aef60
  kaa@polly.(none) authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
```
  6f1aef60
- Merge polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550 · 6832d2cc
  kaa@polly.(none) authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.1-opt
```
  6832d2cc
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9934eec2
  gkodinov/kgeorge@magare.gmz authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
  9934eec2
- Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 23c65a3b
  kaa@polly.(none) authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
  23c65a3b
- Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 17a533e0
  kaa@polly.(none) authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
```
  17a533e0
- type conversions fixed to get rid of warnings · d029dd89
  holyfoot/hf@mysql.com/hfmain.(none) authored Oct 23, 2007
  
  d029dd89
- Merge mysql.com:/home/hf/work/30638/my50-30638 · 05f918e9
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
  05f918e9
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 9b61281c
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
  9b61281c
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 58bce232
  gkodinov/kgeorge@magare.gmz authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-5.1-opt
```
  58bce232
- merge 5.0-opt -> 5.1-opt for bug 30825 · 7ac179bc
  gkodinov/kgeorge@magare.gmz authored Oct 23, 2007
  
  7ac179bc
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · bc80b863
  gkodinov/kgeorge@magare.gmz authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
  bc80b863
- Merge mysql.com:/home/hf/work/30638/my50-30638 · c3033ace
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
  c3033ace
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 7c344185
  gkodinov/kgeorge@magare.gmz authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B28687-5.1-opt
```
  7c344185
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 14c43b98
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
  14c43b98
- type conversion fixed to get rid of warnings · 36092b37
  holyfoot/hf@mysql.com/hfmain.(none) authored Oct 23, 2007
  
  36092b37
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 62737d6d
  gkodinov/kgeorge@magare.gmz authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
  62737d6d
- merging · 7c8d8b5a
  holyfoot/hf@mysql.com/hfmain.(none) authored Oct 23, 2007
  
  7c8d8b5a
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 7fe41df0
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
  7fe41df0
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 0353ecb2
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
  0353ecb2
- Merge mysql.com:/home/hf/work/30638/my50-30638 · 2a7ae86a
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my51-30638
```
  2a7ae86a
- type conversions fixed to avoid warnings on Windows · 9f323e1a
  holyfoot/hf@mysql.com/hfmain.(none) authored Oct 23, 2007
  
  9f323e1a
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 29ea825e
  gluh@mysql.com/eagle.(none) authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
```
  29ea825e