Commits · edbacd3a999a631e53407aee9b14ec5a8f2d4094 · nexedi / MariaDB

14 Dec, 2007 4 commits
- Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge · edbacd3a
  cmiller@zippy.cornsilk.net authored Dec 14, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  edbacd3a
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint · c940d64a
  cmiller@zippy.cornsilk.net authored Dec 14, 2007
```
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
```
  c940d64a
- Add profiling support for embedded server. · 79bb729e
  cmiller@zippy.cornsilk.net authored Dec 14, 2007
  
  79bb729e
- Correct complaints of reviewers and clean up test. · 62d29ea8
  cmiller@zippy.cornsilk.net authored Dec 14, 2007
  
  62d29ea8
11 Dec, 2007 2 commits
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · a30c52cb
  tsmith@ramayana.hindu.god authored Dec 10, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  a30c52cb
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · 8ead8ee1
  tsmith@ramayana.hindu.god authored Dec 10, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  8ead8ee1
10 Dec, 2007 1 commit
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-bug15815 · a19cac93
  tsmith@ramayana.hindu.god authored Dec 10, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
```
  a19cac93
07 Dec, 2007 9 commits
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 31a4940b
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  31a4940b
- Add a way to remove options which mysql-test-run.pl no longer uses. · 4eb097ba
  tsmith@ramayana.hindu.god authored Dec 07, 2007
  
  4eb097ba
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 3b45ef82
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  3b45ef82
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 · 3d01ffd7
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
```
  3d01ffd7
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 8c5f1945
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  8c5f1945
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · 04d363d1
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
```
  04d363d1
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · bf6292ea
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  bf6292ea
- Make tests more robust (clean up better after grant.test) · 6835272b
  tsmith@ramayana.hindu.god authored Dec 07, 2007
  
  6835272b
- Move the test case for bug #20901 from create.test to grant.test, so · 45c78260
  tsmith@ramayana.hindu.god authored Dec 07, 2007
```
testing embedded server works correctly.
```
  45c78260
06 Dec, 2007 2 commits
- Fix compiler warning about wrong integer size (probably harmless) · b922c964
  tsmith@ramayana.hindu.god authored Dec 06, 2007
  
  b922c964
- ctype-simple.c: Backport quick fix to remove Windows compiler warnings · 44d74f63
  tsmith@ramayana.hindu.god authored Dec 06, 2007
  
  44d74f63
05 Dec, 2007 8 commits
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50 · ac811ce4
  tsmith@ramayana.hindu.god authored Dec 05, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
```
  ac811ce4
- Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41 · f1323ad6
  tsmith@ramayana.hindu.god authored Dec 05, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  f1323ad6
- Post-merge fix (reorder tests in ctype_ucs.test) · c3a0572d
  tsmith@ramayana.hindu.god authored Dec 05, 2007
  
  c3a0572d
- Merge ramayana.hindu.god:/home/tsmith/m/bk/51 · 8fc0bfb6
  tsmith@ramayana.hindu.god authored Dec 05, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
```
  8fc0bfb6
- Merge mysql.com:/Users/davi/mysql/bugs/32996-5.1 · aa5786eb
  davi@endora.local authored Dec 05, 2007
```
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
```
  aa5786eb
- Bug#32996 log_tables.test fails sporadically · b79b57c6
  davi@mysql.com/endora.local authored Dec 05, 2007
```
Only select entries from the general_log that were issued by the current
connection.
```
  b79b57c6
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 · 10cab933
  tsmith@ramayana.hindu.god authored Dec 04, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
```
  10cab933
- Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1 · 64530251
  tsmith@ramayana.hindu.god authored Dec 04, 2007
```
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/41
```
  64530251
04 Dec, 2007 2 commits
- Bug#32966 main.status fails. · 1bfc9d69
  anozdrin/alik@station. authored Dec 04, 2007
```
Disable failing test case.
```
  1bfc9d69
- Bug#32965 main.ctype_create fails. · 69792afb
  anozdrin/alik@station. authored Dec 04, 2007
```
Disable failing test case.
```
  69792afb
02 Dec, 2007 5 commits
- Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · 4e08609f
  kaa@polly.(none) authored Dec 02, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
```
  4e08609f
- Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 · 3ecbd79c
  kaa@polly.(none) authored Dec 02, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
```
  3ecbd79c
- Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · 0e78354b
  kaa@polly.(none) authored Dec 02, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
```
  0e78354b
- Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · a0085728
  kaa@polly.(none) authored Dec 02, 2007
```
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
```
  a0085728
- Windows-specific fixes in floating point tests. · d905aade
  kaa@polly.(none) authored Dec 02, 2007
  
  d905aade
01 Dec, 2007 7 commits
- Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · f1236253
  kaa@polly.(none) authored Dec 01, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
```
  f1236253
- Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 · 9699c42c
  kaa@polly.(none) authored Dec 01, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
```
  9699c42c
- Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · 2a52bb82
  kaa@polly.(none) authored Dec 01, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.0-maint
```
  2a52bb82
- Merge polly.(none):/home/kaa/src/maint/bug26788/my50-bug26788 · c8226d73
  kaa@polly.(none) authored Dec 01, 2007
```
into  polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788
```
  c8226d73
- Fixed the floating point number tests on Windows. · 55acce75
  kaa@polly.(none) authored Dec 01, 2007
  
  55acce75
- Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maint · bcbd426c
  kaa@polly.(none) authored Dec 01, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
```
  bcbd426c
- Merge polly.(none):/home/kaa/src/maint/bug26788/my51-bug26788 · a293b125
  kaa@polly.(none) authored Dec 01, 2007
```
into  polly.(none):/home/kaa/src/maint/mysql-5.1-maint
```
  a293b125