Commits · 685f11436836e59837b07aea893a7a5c8ca5f808 · nexedi / MariaDB

12 Dec, 2007 3 commits
- Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime · 685f1143
  kostja@bodhi.(none) authored Dec 12, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
  685f1143
- Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 90ce3a01
  kostja@bodhi.(none) authored Dec 12, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
```
  90ce3a01
- Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4c83efbb
  kostja@bodhi.(none) authored Dec 12, 2007
```
into  bodhi.(none):/opt/local/work/mysql-5.0-runtime
```
  4c83efbb
11 Dec, 2007 2 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · bcb3c304
  df@pippilotta.erinye.com authored Dec 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
```
  bcb3c304
- No we're still at 5.0.54. · de716f1f
  df@pippilotta.erinye.com authored Dec 11, 2007
  
  de716f1f
10 Dec, 2007 13 commits
- Merge adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime · 8651e9dd
  thek@adventure.(none) authored Dec 10, 2007
```
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
```
  8651e9dd
- Test fails because of non deterministric function: show grants for current_user() · 7be4b6b5
  thek@adventure.(none) authored Dec 10, 2007
  
  7be4b6b5
- after-merge fix · ffa270d6
  df@pippilotta.erinye.com authored Dec 10, 2007
  
  ffa270d6
- Merge adventure.(none):/home/thek/Development/cpp/bug27440/my50-bug27440 · 0f1665da
  thek@adventure.(none) authored Dec 10, 2007
```
into  adventure.(none):/home/thek/Development/cpp/mysql-5.0-runtime
```
  0f1665da
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 42945c77
  df@pippilotta.erinye.com authored Dec 10, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  42945c77
- Merge adventure.(none):/home/thek/Development/cpp/bug27440/my51-bug27440 · dfda7855
  thek@adventure.(none) authored Dec 10, 2007
```
into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-runtime
```
  dfda7855
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-release · a079cb9f
  df@pippilotta.erinye.com authored Dec 10, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  a079cb9f
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 9455fafe
  df@pippilotta.erinye.com authored Dec 10, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  9455fafe
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · efd74cb6
  df@pippilotta.erinye.com authored Dec 10, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  efd74cb6
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 · 3f79b0f1
  df@pippilotta.erinye.com authored Dec 10, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  3f79b0f1
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 45c93a58
  df@pippilotta.erinye.com authored Dec 10, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  45c93a58
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1 · 353cd330
  df@pippilotta.erinye.com authored Dec 10, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
```
  353cd330
- Merge adventure.(none):/home/thek/Development/cpp/bug27440/my50-bug27440 · 049ea314
  thek@adventure.(none) authored Dec 10, 2007
```
into  adventure.(none):/home/thek/Development/cpp/bug27440/my51-bug27440
```
  049ea314
07 Dec, 2007 18 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 five.local.lan:/work/merge/mysql-5.1-build · 4fc04761
  mleich@five.local.lan authored Dec 07, 2007
```
into  five.local.lan:/work/merge/mysql-5.1-build-parts
```
  4fc04761
- Bug #27440 read_only allows create and drop database · 392cc185
  thek@adventure.(none) authored Dec 07, 2007
```
When read_only option was enabled, a user without SUPER privilege could
perform CREATE DATABASE and DROP DATABASE operations.

This patch adds a check to make sure this isn't possible. It also attempts to 
simplify the logic used to determine if relevant tables are updated,
making it more human readable.
```
  392cc185
- Merge trift2.:/MySQL/M51/embedtest-5.1 · 72e382ec
  joerg@trift2. authored Dec 07, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  72e382ec
- Makefile.am · 151504a3
  joerg@trift2. authored Dec 07, 2007
```
    Makefile syntax error, comment should precede the whole target.
```
  151504a3
- Merge trift2.:/MySQL/M50/push-5.0 · 74799dc4
  joerg@trift2. authored Dec 07, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  74799dc4
- Merge trift2.:/MySQL/M50/mysql-5.0 · fd5000f6
  joerg@trift2. authored Dec 07, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  fd5000f6
- Merge trift2.:/MySQL/M51/embedtest-5.1 · 5a40e409
  joerg@trift2. authored Dec 07, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  5a40e409
- Merge trift2.:/MySQL/M51/mysql-5.1 · cc609742
  joerg@trift2. authored Dec 07, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  cc609742
- 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
- Makefile.am · 2cf168d6
  joerg@trift2. authored Dec 07, 2007
```
    In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
```
  2cf168d6
- 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 3 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
- Fix for · dba25095
  mleich@five.local.lan authored Dec 06, 2007
```
   Bug#32856 testsuite parts: partition_basic_myisam fails 
                              in pushbuild
Skip test if symlink support is missing.
```
  dba25095
05 Dec, 2007 1 commit
- 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