Commits · 9e25eed679cc53c143a0721d98129d2a5770a733 · nexedi / MariaDB

08 Feb, 2006 19 commits
- Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 9e25eed6
  jmiller@mysql.com authored Feb 08, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
  9e25eed6
- Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 60c99af5
  reggie@big_geek. authored Feb 08, 2006
```
into  big_geek.:C:/Work/mysql/mysql-5.1
```
  60c99af5
- cmakefiles cleanup · 60af944d
  reggie@big_geek. authored Feb 08, 2006
  
  60af944d
- Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0a59884a
  jmiller@mysql.com authored Feb 08, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
  0a59884a
- updated results · be29712d
  jmiller@mysql.com authored Feb 08, 2006
  
  be29712d
- implement a reviw comments · 8e8235ff
  jmiller@mysql.com authored Feb 08, 2006
  
  8e8235ff
- Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e3bfdb9b
  jmiller@mysql.com authored Feb 08, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
  e3bfdb9b
- Implement suggestions from lars review · dacf64b6
  jmiller@mysql.com authored Feb 08, 2006
  
  dacf64b6
- More updates for using NDB as default and some bug fixes along the way · 75b67205
  jmiller@mysql.com authored Feb 08, 2006
  
  75b67205
- Post merge-fixes. · 790c9a05
  konstantin@mysql.com authored Feb 08, 2006
```
Apply a patch by Jonas for NDB diskdata.
```
  790c9a05
- Merge mysql.com:/home/kostja/mysql/tmp_merge · 365404a0
  konstantin@mysql.com authored Feb 08, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
  365404a0
- Merge mysql.com:/home/kostja/mysql/tmp_merge · 572bc286
  konstantin@mysql.com authored Feb 08, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
  572bc286
- Merge mysql.com:/home/kostja/mysql/tmp_merge2 · 34bb9c61
  konstantin@mysql.com authored Feb 08, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
  34bb9c61
- Merge mysql.com:/home/kostja/mysql/tmp_merge · d4c55169
  konstantin@mysql.com authored Feb 08, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
  d4c55169
- Apply the diskdata patch by Jonas. · 0831fd61
  konstantin@mysql.com authored Feb 08, 2006
  
  0831fd61
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7452faa5
  konstantin@mysql.com authored Feb 08, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
  7452faa5
- Fix for BUG#17180: Failure in trigger-grant on Solaris. · 66e1e8d4
  anozdrin@mysql.com authored Feb 08, 2006
```
The problem is that LEX_STRING was used instead of LEX_STRING::str.
```
  66e1e8d4
- Fix compilation failure. · e24336b0
  anozdrin@mysql.com authored Feb 08, 2006
  
  e24336b0
- Update test results · cacdb371
  msvensson@neptunus.(none) authored Feb 08, 2006
  
  cacdb371
07 Feb, 2006 21 commits
- Merge mysql.com:/home/kostja/mysql/tmp_merge · da377d1e
  konstantin@mysql.com authored Feb 08, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
  da377d1e
- Merge mysql.com:/home/kostja/mysql/tmp_merge · 06359654
  konstantin@mysql.com authored Feb 08, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
  06359654
- Merge mysql.com:/home/kostja/mysql/tmp_merge · e6568630
  konstantin@mysql.com authored Feb 08, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
  e6568630
- Merge mysql.com:/home/kostja/mysql/tmp_merge · 0f62f384
  konstantin@mysql.com authored Feb 07, 2006
```
into  mysql.com:/home/kostja/mysql/mysql-5.1-merge
```
  0f62f384
- Merge neptunus.(none):/home/msvensson/mysql/tmp_merge · b59c6786
  msvensson@neptunus.(none) authored Feb 07, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
```
  b59c6786
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4ddcc7cc
  msvensson@neptunus.(none) authored Feb 07, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
```
  4ddcc7cc
- Removed extra "drop view v1" · ba6b1a6e
  msvensson@neptunus.(none) authored Feb 07, 2006
  
  ba6b1a6e
- Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e5a7238a
  jmiller@mysql.com authored Feb 07, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
  e5a7238a
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 4e64543e
  tomas@poseidon.ndb.mysql.com authored Feb 07, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  4e64543e
- Update after merge 5.0 -> 5.1 · cc1fd814
  msvensson@neptunus.(none) authored Feb 07, 2006
  
  cc1fd814
- Bug #17188 CRBR: ignores --binlog_ignore_db= settings · 99cbc34b
  tomas@poseidon.ndb.mysql.com authored Feb 07, 2006
  
  99cbc34b
- Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a20976ff
  jmiller@mysql.com authored Feb 07, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
  a20976ff
- Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my51-mysqltest_float_result · bbff8ade
  msvensson@neptunus.(none) authored Feb 07, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
```
  bbff8ade
- Merge neptunus.(none):/home/msvensson/mysql/bug15302/my51-bug15302 · 4fc2b926
  msvensson@neptunus.(none) authored Feb 07, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
```
  4fc2b926
- Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var · bcefb0c7
  msvensson@neptunus.(none) authored Feb 07, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
```
  bcefb0c7
- Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var · 6894f38d
  msvensson@neptunus.(none) authored Feb 07, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my51-mysqltest_var
```
  6894f38d
- Merge... · 3f1cf9fa
  msvensson@neptunus.(none) authored Feb 07, 2006
```
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
```
  3f1cf9fa
- Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e0553b78
  reggie@big_geek. authored Feb 07, 2006
```
into  big_geek.:C:/Work/mysql/mysql-5.1
```
  e0553b78
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 53040a07
  tomas@poseidon.ndb.mysql.com authored Feb 07, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  53040a07
- Merge... · 809deba6
  msvensson@neptunus.(none) authored Feb 07, 2006
```
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
into  neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my51-mysqltestrun_check_testcases
```
  809deba6
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 96721c40
  tomas@poseidon.ndb.mysql.com authored Feb 07, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
```
  96721c40