Commits · e4bad7a8d08d5effc4387f080037a511ec2f5cef · nexedi / MariaDB

08 Jan, 2008 1 commit
- Post-merge fixes to make tests pass. · e4bad7a8
  mats@unknown.kindahl.net authored Jan 08, 2008
  
  e4bad7a8
19 Dec, 2007 1 commit
- Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl · a9daa2cd
  mkindahl@dl145h.mysql.com authored Dec 19, 2007
```
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
```
  a9daa2cd
15 Dec, 2007 2 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4bb50356
kostja@bodhi.(none) authored Dec 15, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
```
4bb50356

BUG#32205 Replaying statements from mysqlbinlog fails with a syntax error, replicates fine · c2f00cc3

hezx@hezx.(none) authored Dec 15, 2007

The reason of this bug is that when mysqlbinlog dumps a query, the query is written to
output with a delimeter appended right after it, if the query string ends with a '--'
comment, then the delimeter would be considered as part of the comment, if there are any
statements after this query, then it will cause a syntax error.

Start a newline before appending delimiter after a query string

c2f00cc3

14 Dec, 2007 4 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · d2a93fd6
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  d2a93fd6
- Raise version number after cloning 5.0.54 · 028ed336
  kent/mysqldev@mysql.com/production.mysql.com authored Dec 14, 2007
  
  028ed336
- Merge station.:/mnt/raid/alik/MySQL/devel/5.0 · 61b903f8
  anozdrin/alik@station. authored Dec 14, 2007
```
into  station.:/mnt/raid/alik/MySQL/devel/5.0-rt
```
  61b903f8
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 70902cdd
  tomas@whalegate.ndb.mysql.com authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  70902cdd
13 Dec, 2007 14 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 4bc90fe4
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  4bc90fe4
- Bug #33168 Incorrectly handled parameters can make the TC crash during node failure · 3a891982
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
- during commit deadlock timeout needs to be at least 5 times db hearbeat
```
  3a891982
- additional fix · 8be07b88
  gluh@mysql.com/eagle.(none) authored Dec 13, 2007
  
  8be07b88
- valgrind error fix · 2627f775
  gluh@mysql.com/eagle.(none) authored Dec 13, 2007
  
  2627f775
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 6821f368
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  6821f368
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · f84b4524
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  f84b4524
- after merge fix · 9df070ed
  gluh@mysql.com/eagle.(none) authored Dec 13, 2007
  
  9df070ed
- Bug #33206 signal not reset properly in ndb · b009d97f
  tomas@whalegate.ndb.mysql.com authored Dec 13, 2007
  
  b009d97f
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · ffeb563d
  gluh@eagle.(none) authored Dec 13, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  ffeb563d
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · e0395950
  gluh@eagle.(none) authored Dec 13, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  e0395950
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9f4f6acc
  sergefp@foxhole.(none) authored Dec 13, 2007
```
into  mysql.com:/home/psergey/mysql-5.0-bug32198
```
  9f4f6acc
- BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly · dd0854db
  sergefp@mysql.com authored Dec 13, 2007
```
- Make conditions like "date_col $CMP$ 'datetime-const'" range-sargable
```
  dd0854db
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 4e50bb0e
  gluh@mysql.com/eagle.(none) authored Dec 13, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt
```
  4e50bb0e
- Merge station.:/mnt/raid/alik/MySQL/devel/5.0 · 7d9dd21c
  anozdrin/alik@station. authored Dec 13, 2007
```
into  station.:/mnt/raid/alik/MySQL/devel/5.0-rt
```
  7d9dd21c
12 Dec, 2007 2 commits
- Dummy push to help pushbuild running again. · 9217f011
  istruewing@stella.local authored Dec 12, 2007
```
Fixed case of comment.
```
  9217f011
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4c83efbb
  kostja@bodhi.(none) authored Dec 12, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
```
  4c83efbb
11 Dec, 2007 6 commits
- Merge stella.local:/home2/mydev/mysql-5.0-amain · fb93ba7a
  istruewing@stella.local authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  fb93ba7a
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · faaac96f
  tomas@whalegate.ndb.mysql.com authored Dec 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
  faaac96f
- No we're still at 5.0.54. · de716f1f
  df@pippilotta.erinye.com authored Dec 11, 2007
  
  de716f1f
- Merge stella.local:/home2/mydev/mysql-5.0-amain · ba2d58ae
  istruewing@stella.local authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  ba2d58ae
- remoce compiler warnings · 9a189642
  tomas@whalegate.ndb.mysql.com authored Dec 11, 2007
  
  9a189642
- Merge hezx.(none):/media/hda5/work/mysql/bkroot/mysql-5.0-rpl · a85e8a3f
  hezx@hezx.(none) authored Dec 11, 2007
```
into  hezx.(none):/media/hda5/work/mysql/bkwork/bug#30998/5.0
```
  a85e8a3f
10 Dec, 2007 8 commits
- Test fails because of non deterministric function: show grants for current_user() · 7be4b6b5
  thek@adventure.(none) authored Dec 10, 2007
  
  7be4b6b5
- Merge adventure.(none):/home/thek/Development/cpp/bug27440/my50-bug27440 · 0f1665da
  thek@adventure.(none) authored Dec 10, 2007
```
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
```
  0f1665da
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-release · a079cb9f
  df@pippilotta.erinye.com authored Dec 10, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  a079cb9f
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · efd74cb6
  df@pippilotta.erinye.com authored Dec 10, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  efd74cb6
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 45c93a58
  df@pippilotta.erinye.com authored Dec 10, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  45c93a58
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 · 353cd330
  df@pippilotta.erinye.com authored Dec 10, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
```
  353cd330
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · ddbb4d42
  tomas@whalegate.ndb.mysql.com authored Dec 10, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  ddbb4d42
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · ae7d4929
  tomas@whalegate.ndb.mysql.com authored Dec 10, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
  ae7d4929
09 Dec, 2007 2 commits
- Forced compilers to remove the warning appeared after the patch · 0e3e5cf4
  igor@olga.mysql.com authored Dec 09, 2007
```
with a fix for bug 32694. 
```
  0e3e5cf4
- Merge olga.mysql.com:/home/igor/mysql-5.0-opt · f781e154
  igor@olga.mysql.com authored Dec 08, 2007
```
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug27545
```
  f781e154