Commits · 394da857fd093d4b2b2e222b6d239e98696d18fe · nexedi / MariaDB

06 Mar, 2006 40 commits
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 394da857
  msvensson@neptunus.(none) authored Mar 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  394da857
- Merge mysql.com:/extern/mysql/bk/mysql-5.1-new · 1e028904
  pem@mysql.com authored Mar 06, 2006
```
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
```
  1e028904
- Merge bk-internal:/home/bk/mysql-5.1-new · 6634aec8
  msvensson@neptunus.(none) authored Mar 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  6634aec8
- Update test result · 0acda146
  msvensson@neptunus.(none) authored Mar 06, 2006
  
  0acda146
- Update test result · aa3c00b5
  msvensson@neptunus.(none) authored Mar 06, 2006
  
  aa3c00b5
- Update test result · 3ae35193
  msvensson@neptunus.(none) authored Mar 06, 2006
  
  3ae35193
- Merge mysql.com:/extern/mysql/5.0/generic/mysql-5.0 · a0658437
  pem@mysql.com authored Mar 06, 2006
```
into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new
```
  a0658437
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6feaef75
  mskold@mysql.com authored Mar 06, 2006
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
```
  6feaef75
- Tables are now removed remotely by binlog_thread · 48cc86db
  mskold@mysql.com authored Mar 06, 2006
  
  48cc86db
- Build fix, liboptions.a is now a libtool convenience library · 703d2f89
  msvensson@neptunus.(none) authored Mar 06, 2006
```
 -liboptions.a -> liboptions.la
```
  703d2f89
- Disable rpl_ndb_multt_update2 · 77214de8
  msvensson@neptunus.(none) authored Mar 06, 2006
  
  77214de8
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b65fbcbc
  cmiller@zippy.(none) authored Mar 06, 2006
```
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
```
  b65fbcbc
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · a2a5925d
  cmiller@zippy.(none) authored Mar 06, 2006
```
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0.19-tbr
```
  a2a5925d
- Merge bk-internal:/home/bk/mysql-5.1-new · 6457050d
  msvensson@neptunus.(none) authored Mar 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  6457050d
- Merge bk-internal:/home/bk/mysql-5.1-new · efd3dad2
  vtkachenko@quadxeon.mysql.com authored Mar 06, 2006
```
into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new
```
  efd3dad2
- configure.in: · 8c8d7b80
  vtkachenko@quadxeon.mysql.com authored Mar 06, 2006
```
  Change comment for fast-mutex
```
  8c8d7b80
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e05be757
  pekka@mysql.com authored Mar 06, 2006
```
into  mysql.com:/space/pekka/ndb/version/my51
```
  e05be757
- configure.in: · 9ae37a54
  vtkachenko@quadxeon.mysql.com authored Mar 06, 2006
```
  Change default value --with-fast-mutexes=no
```
  9ae37a54
- Merge bk-internal:/home/bk/mysql-5.1-new · c9d14a03
  msvensson@neptunus.(none) authored Mar 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  c9d14a03
- Merge bk-internal:/home/bk/mysql-5.0 · 30071e97
  msvensson@neptunus.(none) authored Mar 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  30071e97
- ndb - close non-bug rpl_ndb_charset Bug#17246 · 5d026c1d
  pekka@mysql.com authored Mar 06, 2006
  
  5d026c1d
- Merge · ab77867e
  kent@mysql.com authored Mar 06, 2006
  
  ab77867e
- Merge bk-internal:/home/bk/mysql-5.0 · 108fc101
  msvensson@neptunus.(none) authored Mar 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  108fc101
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e6983ff2
  pekka@mysql.com authored Mar 06, 2006
```
into  mysql.com:/space/pekka/ndb/version/my51
```
  e6983ff2
- Merge mysql.com:/space/pekka/ndb/version/my51 · 12c82da2
  pekka@mysql.com authored Mar 06, 2006
```
into  mysql.com:/space/pekka/ndb/version/my51-dict
```
  12c82da2
- Merge mysql.com:/usr/home/bar/mysql-4.1.b15949 · 6823225a
  bar@mysql.com authored Mar 06, 2006
```
into  mysql.com:/usr/home/bar/mysql-5.0
```
  6823225a
- BUG#10460 SHOW CREATE TABLE uses inconsistent upper/lower case · fd47e2d1
  msvensson@neptunus.(none) authored Mar 06, 2006
```
 - Fix result files
```
  fd47e2d1
- Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7f4b27cf
  gluh@mysql.com authored Mar 06, 2006
```
into mysql.com:/home/gluh/MySQL/Merge/5.0
```
  7f4b27cf
- Merge bk-internal:/home/bk/mysql-5.0 · ee97bebc
  msvensson@devsrv-b.mysql.com authored Mar 06, 2006
```
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
```
  ee97bebc
- Fix merge error, missing "," in result file · 6ffe593d
  msvensson@neptunus.(none) authored Mar 06, 2006
  
  6ffe593d
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ff71af1e
  kent@mysql.com authored Mar 06, 2006
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
```
  ff71af1e
- Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-tmp · dfae81d0
  kent@mysql.com authored Mar 06, 2006
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
```
  dfae81d0
- Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 · 321eb3dc
  gluh@mysql.com authored Mar 06, 2006
```
into mysql.com:/home/gluh/MySQL/Merge/5.0
```
  321eb3dc
- post-merge fix · f3ce98d2
  gluh@eagle.intranet.mysql.r18.ru authored Mar 06, 2006
  
  f3ce98d2
- Merge devsrv-b.mysql.com:/space/magnus/mysql-5.0 · 26606070
  msvensson@devsrv-b.mysql.com authored Mar 06, 2006
```
into  devsrv-b.mysql.com:/space/magnus/bug17377/my50-bug17377
```
  26606070
- Merge bk-internal:/home/bk/mysql-5.0 · 3f935b27
  msvensson@neptunus.(none) authored Mar 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
  3f935b27
- Merge bk-internal:/home/bk/mysql-5.1-new · e4705ea4
  msvensson@neptunus.(none) authored Mar 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  e4705ea4
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7d7da887
  mskold@mysql.com authored Mar 06, 2006
```
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
```
  7d7da887
- Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · e019d605
  bar@mysql.com authored Mar 06, 2006
```
into  mysql.com:/usr/home/bar/mysql-4.1.b15949
```
  e019d605
- Merge neptunus.(none):/home/msvensson/mysql/bug10460/my51-bug10460 · 40b3222b
  msvensson@neptunus.(none) authored Mar 06, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  40b3222b