Commits · 8c4206a31d90a2b8f0c2e1a6a0314578ce800af6 · nexedi / MariaDB

17 Jun, 2006 6 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 8c4206a3
  serg@serg.mylan authored Jun 17, 2006
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
```
  8c4206a3
- atomic ops: · 48c453a4
  serg@serg.mylan authored Jun 17, 2006
```
    my_atomic_XX_t -> intXX, no implicit locking anymore
    simplified framework, support for requested cleanups
```
  48c453a4
- ndb - bug#19285 post merge 5.0->5.1 fix (error codes) · 5d3aa23d
  pekka@clam.ndb.mysql.com authored Jun 17, 2006
  
  5d3aa23d
- Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285 · adc43348
  pekka@clam.ndb.mysql.com authored Jun 17, 2006
```
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285
```
  adc43348
- ndb - bug#19285 minor fixes · 35416445
  pekka@clam.ndb.mysql.com authored Jun 17, 2006
  
  35416445
- Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285 · 95aa9c28
  pekka@clam.ndb.mysql.com authored Jun 17, 2006
```
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285
```
  95aa9c28
16 Jun, 2006 14 commits
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 694c1db7
  serg@serg.mylan authored Jun 16, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  694c1db7
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 2893e209
  serg@serg.mylan authored Jun 16, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  2893e209
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 86f2f582
  petr@outpost.site authored Jun 16, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
```
  86f2f582
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 1327ca01
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 16, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-fix
```
  1327ca01
- Fix for broken compile if not compiling with partitioning · 0237f036
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 16, 2006
  
  0237f036
- remove wrong assert · c4dd4a39
  serg@serg.mylan authored Jun 16, 2006
  
  c4dd4a39
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 23ac9266
  elliot@lost.local authored Jun 16, 2006
```
into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.1
```
  23ac9266
- Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 66d7d650
  stewart@willster.(none) authored Jun 16, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
```
  66d7d650
- Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue · b5165c37
  stewart@mysql.com authored Jun 16, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
```
  b5165c37
- Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue · 0811fd79
  stewart@willster.(none) authored Jun 16, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
```
  0811fd79
- String::set(double) and set(longlong) -> set_real() and set_int() · d00b5654
  serg@serg.mylan authored Jun 16, 2006
```
fix Field::store(double) being used instead of store(longlong)

NB: overloading functions is evil
```
  d00b5654
- Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 45d7e75c
  stewart@mysql.com authored Jun 16, 2006
```
into  mysql.com:/home/stewart/Documents/MySQL/5.1/main
```
  45d7e75c
- Merge mysql.com:/home/marty/MySQL/mysql-5.0 · 49790e0d
  mskold@mysql.com authored Jun 16, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.1
```
  49790e0d
- Fixing false alarm errors on windows build from a clean clone. · 10fd4b0f
  elliot@mysql.com authored Jun 15, 2006
  
  10fd4b0f
15 Jun, 2006 20 commits
- Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 · 0845bc49
  serg@serg.mylan authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  0845bc49
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · a3c4c13f
  petr@outpost.site authored Jun 16, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
```
  a3c4c13f
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · ce07f4b9
  serg@serg.mylan authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  ce07f4b9
- Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5d2d3a53
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 15, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
```
  5d2d3a53
- BUG#19940: Add Valgrind suppression for false alarm report. · 061bdf91
  knielsen@mysql.com authored Jun 15, 2006
  
  061bdf91
- Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · c8da9ebd
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 15, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
```
  c8da9ebd
- BUG#20397: Crash when alter table t1 engine = x; · b631659c
  mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se authored Jun 15, 2006
```
Review fixes
```
  b631659c
- don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS · 3c609f0a
  serg@serg.mylan authored Jun 15, 2006
```
don't add CFLAGS/CXXFLAGS to ./configure command line in config.status
but _do_ add them before calling plugins' configure scripts
```
  3c609f0a
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · 86420b38
  petr@outpost.site authored Jun 15, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
```
  86420b38
- Fix for bug#19667 group by a decimal expression yields wrong result · 00fcdf8c
  gluh@eagle.intranet.mysql.r18.ru authored Jun 15, 2006
  
  00fcdf8c
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 2210731e
  petr@outpost.site authored Jun 15, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
```
  2210731e
- Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · cde3d7d8
  petr@mysql.com authored Jun 15, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
```
  cde3d7d8
- Merge mysql.com:/home/mydev/mysql-5.1--main · 33e38a67
  ingo@chilla.local authored Jun 15, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
  33e38a67
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · a06dda12
  serg@serg.mylan authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  a06dda12
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 03a80df3
  serg@serg.mylan authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  03a80df3
- Fixed typo in variable name · 32c45f92
  mskold@mysql.com authored Jun 15, 2006
  
  32c45f92
- Removed stray bracket · 7636df86
  mskold@mysql.com authored Jun 15, 2006
  
  7636df86
- Merge mysql.com:/home/mydev/mysql-5.0-amerge · 2b6b5b63
  ingo@mysql.com authored Jun 15, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
  2b6b5b63
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 22bb0263
  serg@serg.mylan authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
  22bb0263
- Merge rurik.mysql.com:/home/igor/tmp_merge · 88b0e989
  igor@rurik.mysql.com authored Jun 14, 2006
```
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
```
  88b0e989