Commits · 69395833bcda32a2b800bc67144d730e37f1c027 · Kirill Smelkov / mariadb

25 Apr, 2007 3 commits

Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 69395833
df@pippilotta.erinye.com authored Apr 25, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
69395833

Fix test case that was broken for builds without InnoDB. · b353df74

df@pippilotta.erinye.com authored Apr 25, 2007

```yaml
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-vanilla-building
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-vanilla-building
```

Fix test cases to pass for a plain ./configure && make build. This includes disabling two test cases when certain features are not present in the server. We're not losing coverage from this because these features are usually present, and disabling them here only serves the purpose to make the test cases work in the unlikely case that they aren't.
---
fixes

b353df74

Fix test case that was broken for builds without InnoDB. · e0f148d5
df@pippilotta.erinye.com authored Apr 25, 2007

e0f148d5

24 Apr, 2007 8 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 0f33daac
  df@pippilotta.erinye.com authored Apr 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  0f33daac
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 5ac0fc32
  df@pippilotta.erinye.com authored Apr 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  5ac0fc32
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 6992b901
  df@pippilotta.erinye.com authored Apr 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  6992b901
- restrict recently added file to GPLv2 · adf57595
  df@pippilotta.erinye.com authored Apr 24, 2007
  
  adf57595
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work · 3cea9c69
  df@pippilotta.erinye.com authored Apr 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-27818
```
  3cea9c69
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 6e1a6c73
  df@pippilotta.erinye.com authored Apr 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  6e1a6c73
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 211ddd4b
  df@pippilotta.erinye.com authored Apr 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  211ddd4b
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · f6aabc5a
  df@pippilotta.erinye.com authored Apr 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  f6aabc5a
23 Apr, 2007 14 commits
- Merge debian.(none):/M50/push-5.0 · 08132c7f
  joerg@debian.(none) authored Apr 23, 2007
```
into  debian.(none):/M51/push-5.1
```
  08132c7f
- Merge debian.(none):/M41/push-4.1 · fd409818
  joerg@debian.(none) authored Apr 23, 2007
```
into  debian.(none):/M50/push-5.0
```
  fd409818
- Merge debian.(none):/M50/push-5.0 · b3398fbb
  joerg@debian.(none) authored Apr 23, 2007
```
into  debian.(none):/M51/push-5.1
```
  b3398fbb
- Merge debian.(none):/M50/bug14685-5.0 · 6ffe87d0
  joerg@debian.(none) authored Apr 23, 2007
```
into  debian.(none):/M50/push-5.0
```
  6ffe87d0
- Merge debian.(none):/M51/bug14685-5.1 · 3f3e8e90
  joerg@debian.(none) authored Apr 23, 2007
```
into  debian.(none):/M51/push-5.1
```
  3f3e8e90
- Merge debian.(none):/M50/bug14685-5.0 · c201a635
  joerg@debian.(none) authored Apr 23, 2007
```
into  debian.(none):/M51/bug14685-5.1
```
  c201a635
- dbug/dbug_analyze.c : Avoid the unresolved symbol "my_thread_global_init()" · 4fbdddf2
  joerg@debian.(none) authored Apr 23, 2007
```
                        in a build "--without-server".

Fix for bug#14685
```
  4fbdddf2
- Merge debian.(none):/M41/mysql-4.1 · e7918128
  joerg@debian.(none) authored Apr 23, 2007
```
into  debian.(none):/M41/push-4.1
```
  e7918128
- Merge debian.(none):/M50/mysql-5.0 · 9c04bfed
  joerg@debian.(none) authored Apr 23, 2007
```
into  debian.(none):/M50/push-5.0
```
  9c04bfed
- Merge debian.(none):/M51/mysql-5.1 · 94008df3
  joerg@debian.(none) authored Apr 23, 2007
```
into  debian.(none):/M51/push-5.1
```
  94008df3
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 1cde5573
  df@pippilotta.erinye.com authored Apr 23, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  1cde5573
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build · 6dc038cb
  df@pippilotta.erinye.com authored Apr 23, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  6dc038cb
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-27701 · 7c2433a0
  df@pippilotta.erinye.com authored Apr 23, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  7c2433a0
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-27701 · 02d6b57f
  df@pippilotta.erinye.com authored Apr 23, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  02d6b57f
21 Apr, 2007 6 commits
- Merge bk-internal:/home/bk/mysql-5.0 · 121bc31b
  mjorgensen@blade09.mysql.com authored Apr 21, 2007
```
into  blade09.mysql.com:/tmp/mmj/mysql-5.0-runtime
```
  121bc31b
- Merge bk-internal:/home/bk/mysql-5.1 · 7855ae51
  mjorgensen@blade09.mysql.com authored Apr 21, 2007
```
into  blade09.mysql.com:/tmp/mmj/mysql-5.1-runtime
```
  7855ae51
- test fixed for embedded server · 50045579
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 21, 2007
  
  50045579
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 381c72b8
  holyfoot/hf@hfmain.(none) authored Apr 21, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  381c72b8
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · c22d6fbb
  ibabaev@bk-internal.mysql.com authored Apr 21, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
```
  c22d6fbb
- Post-merge fix. · 8c85357e
  igor@olga.mysql.com authored Apr 20, 2007
  
  8c85357e
20 Apr, 2007 9 commits
- manual merge · c574d95a
  malff/marcsql@weblab.(none) authored Apr 20, 2007
  
  c574d95a
- Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 · c09d1cfe
  ibabaev@bk-internal.mysql.com authored Apr 21, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
```
  c09d1cfe
- Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-base · fc363137
  malff/marcsql@weblab.(none) authored Apr 20, 2007
```
into  weblab.(none):/home/marcsql/TREE/mysql-5.0-rt-merge
```
  fc363137
- Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base · 2d6d8e2a
  malff/marcsql@weblab.(none) authored Apr 20, 2007
```
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
```
  2d6d8e2a
- Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt · 4434ff13
  evgen@moonbone.local authored Apr 21, 2007
```
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
```
  4434ff13
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · fc610365
  tomas@whalegate.ndb.mysql.com authored Apr 20, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
```
  fc610365
- mysql-test/t/sp_trans_log.test : Disable it in embedded (test fails). · bcaa5cc7
  joerg@trift2. authored Apr 20, 2007
  
  bcaa5cc7
- Added missing result file for rpl_critical_errors. · f4c4de6a
  mats@romeo.(none) authored Apr 20, 2007
  
  f4c4de6a
- Adding missing result file for rpl_critical_errors. · ae9744f2
  mats@romeo.(none) authored Apr 20, 2007
  
  ae9744f2