Commits · 03d99c595695fee897e66d7fb83a6b62603c934d · Kirill Smelkov / mariadb

11 Dec, 2007 1 commit
- Merge stella.local:/home2/mydev/mysql-5.1-amain · 03d99c59
  istruewing@stella.local authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
  03d99c59
10 Dec, 2007 8 commits
- after-merge fix · ffa270d6
  df@pippilotta.erinye.com authored Dec 10, 2007
  
  ffa270d6
- 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 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
08 Dec, 2007 1 commit

Bug#29830 Test case 'events_scheduling' fails on Mac OS X and Windows. · 71160422

dkatz@damien-katzs-computer.local authored Dec 07, 2007

Change LAST_EXECUTED time the execution start time, instead of the execution completion time. This ensures the END time always the same or later than the LAST_EXECUTED time.

71160422

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
- 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
- BUG#32817 - though CSV is marked as supported create table is rejected · 413112fb
  svoj@mysql.com/june.mysql.com authored Dec 07, 2007
```
            with error 1005.

CSV doesn't support nullable fields. Report descriptive error if create
table with nullable field is requested.
```
  413112fb
- 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 9 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 witty.:/Users/mattiasj/clones/mysql-5.1-bug30822 · 5452a154
  mattiasj@witty. authored Dec 05, 2007
```
into  witty.:/Users/mattiasj/clones/51to_push
```
  5452a154
- 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