Commits · 5d6365d0a30e9865c387c3290d4d8697690e58ee · nexedi / MariaDB

08 Jul, 2005 1 commit
- Apply Guilhem's patch (mmap->my_mmap, munmap->my_munmap in ha_tina) to improve · 5d6365d0
  petr@mysql.com authored Jul 08, 2005
```
portability.
```
  5d6365d0
28 Jun, 2005 1 commit
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1 · e98959df
  svoj@mysql.com authored Jun 28, 2005
```
into mysql.com:/home/svoj/devel/mysql/WL2535-mysql-5.1
```
  e98959df
23 Jun, 2005 5 commits
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 252bb624
  marty@flipper.bredbandsbolaget.se authored Jun 23, 2005
```
into flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.1
```
  252bb624
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · c485ce7d
  ndbdev@dl145b.mysql.com authored Jun 23, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
```
  c485ce7d
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · d66770b5
  sergefp@mysql.com authored Jun 23, 2005
```
into mysql.com:/home/psergey/mysql-5.0-back-vac-look
```
  d66770b5
- Made upgrade compatibility in 5.1 range to latest build version · 67c5214e
  marty@flipper.bredbandsbolaget.se authored Jun 23, 2005
  
  67c5214e
- Merge flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.0 · eb729f9a
  marty@flipper.bredbandsbolaget.se authored Jun 23, 2005
```
into flipper.bredbandsbolaget.se:/home/marty/MySQL/mysql-5.1
```
  eb729f9a
22 Jun, 2005 33 commits
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 053dd260
  ndbdev@dl145b.mysql.com authored Jun 23, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
```
  053dd260
- Merge mdk10.(none):/home/reggie/bk/bug9148 · 98ddf74d
  reggie@mdk10.(none) authored Jun 22, 2005
```
into mdk10.(none):/home/reggie/bk/mysql-5.0-base
```
  98ddf74d
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4ddc13af
  evgen@moonbone.local authored Jun 23, 2005
```
into moonbone.local:/work/mysql-5.0-merge
```
  4ddc13af
- insert_update.result, insert_update.test, sql_base.cc: · dc654646
  evgen@moonbone.local authored Jun 23, 2005
```
  Fix for bugfix #9728 merge
```
  dc654646
- Bug #9728 fix merge · 5c8e3341
  evgen@moonbone.local authored Jun 23, 2005
  
  5c8e3341
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7f5d7d47
  patg@radha.local authored Jun 22, 2005
```
into radha.local:/Volumes/disk2s1/mysql-5.0
```
  7f5d7d47
- Remove THD::stmt_backup · 6a0adade
  konstantin@mysql.com authored Jun 22, 2005
  
  6a0adade
- Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 · 70599271
  reggie@mdk10.(none) authored Jun 22, 2005
```
into mdk10.(none):/home/reggie/bk/bug9148
```
  70599271
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 54d3b001
  evgen@moonbone.local authored Jun 22, 2005
```
into moonbone.local:/work/mysql-4.1-bug-8147
```
  54d3b001
- item.h: · 6b9df50c
  evgen@moonbone.local authored Jun 22, 2005
```
  Fix for fix for bug#9728 decreased functionality in "on duplicate key update"
  Have to return false to set flag for whole expression.
```
  6b9df50c
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 3149e8c1
  ndbdev@dl145b.mysql.com authored Jun 22, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
```
  3149e8c1
- Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 144045ff
  patg@radha.local authored Jun 22, 2005
```
into radha.local:/Volumes/disk2s1/mysql-5.0
```
  144045ff
- Bug# 9926, This is the same as changeset 1.1934, which was approved by Monty · 172dab87
  patg@radha.local authored Jun 22, 2005
  
  172dab87
- mtr_cases.pl: · 0c72aa5e
  kent@mysql.com authored Jun 22, 2005
```
  Add a slave when running the federated test case
```
  0c72aa5e
- Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0 · bafab2dd
  elliot@mysql.com authored Jun 22, 2005
```
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
```
  bafab2dd
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 6b3aa6d0
  ndbdev@dl145b.mysql.com authored Jun 22, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
```
  6b3aa6d0
- Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0f92a2cf
  elliot@mysql.com authored Jun 22, 2005
```
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
```
  0f92a2cf
- mysql-test-run.pl: · 35c939d3
  kent@mysql.com authored Jun 22, 2005
```
  Bug#11481, set charset directory to mysqlbinlog
```
  35c939d3
- Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1-merge2 · 776fc436
  elliot@mysql.com authored Jun 22, 2005
```
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
```
  776fc436
- Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 · c4fe91b7
  kent@mysql.com authored Jun 22, 2005
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
```
  c4fe91b7
- Merge emurphy@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7ddb53c9
  elliot@mysql.com authored Jun 22, 2005
```
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
```
  7ddb53c9
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · dcef1c75
  ndbdev@dl145b.mysql.com authored Jun 22, 2005
```
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
```
  dcef1c75
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7e7987ee
  sergefp@mysql.com authored Jun 22, 2005
```
into mysql.com:/home/psergey/mysql-5.0-bug8441
```
  7e7987ee
- Merge mysql.com:/Users/emurphy/src/bk-clean/mysql-4.1-merge · 201f3a78
  elliot@mysql.com authored Jun 22, 2005
```
into  mysql.com:/Users/emurphy/src/bk-clean/mysql-5.0
```
  201f3a78
- Fix for bug #10886 merge · 473d7d59
  evgen@moonbone.local authored Jun 22, 2005
  
  473d7d59
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · aef810cb
  sergefp@mysql.com authored Jun 22, 2005
```
into mysql.com:/home/psergey/mysql-5.0-bug8441
```
  aef810cb
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1b59ffb8
  svoj@mysql.com authored Jun 22, 2005
```
into mysql.com:/mnt/archive/svoj/mysql/mysql-5.0
```
  1b59ffb8
- Better AR guessing. · c275bde2
  svoj@mysql.com authored Jun 22, 2005
  
  c275bde2
- Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2af4f441
  marko@hundin.mysql.fi authored Jun 22, 2005
```
into hundin.mysql.fi:/home/marko/mysql-5.0-current
```
  2af4f441
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 8b9bf757
  konstantin@mysql.com authored Jun 22, 2005
```
into mysql.com:/opt/local/work/mysql-5.0-10736-new
```
  8b9bf757
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 975cbd82
  svoj@mysql.com authored Jun 22, 2005
```
into mysql.com:/home/svoj/devel/mysql/yassl-mysql-5.0
```
  975cbd82
- Better comment. · 55ae33e8
  svoj@mysql.com authored Jun 22, 2005
  
  55ae33e8
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · dc7aa03e
  konstantin@mysql.com authored Jun 22, 2005
```
into mysql.com:/opt/local/work/mysql-5.0-10736-new
```
  dc7aa03e