Commits · 9870db834597792c830e14987477a5c1283cd850 · Kirill Smelkov / mariadb

31 May, 2007 19 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 9870db83
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  9870db83
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 11c83451
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  11c83451
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn · 7f203056
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  7f203056
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn · 20661e63
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  20661e63
- fix test case · 6e7585a0
  df@pippilotta.erinye.com authored May 31, 2007
  
  6e7585a0
- fixed not matching if/endif (cmake) · 9a151eb3
  georg@bing.mysql.com authored May 31, 2007
  
  9a151eb3
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 30305801
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  30305801
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work · cf9ee7b1
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  cf9ee7b1
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 5d77288d
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  5d77288d
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn · 8f4c174e
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn
```
  8f4c174e
- fix test case broken for ps-protocol by previous push · fc1e0388
  df@pippilotta.erinye.com authored May 31, 2007
  
  fc1e0388
- after-merge fixes: test cases that were moved to extra/binlog_tests do not... · ce12b17f
  df@pippilotta.erinye.com authored May 31, 2007
```
after-merge fixes: test cases that were moved to extra/binlog_tests do not need to check for binlog being enabled
```
  ce12b17f
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · d8ab95d8
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  d8ab95d8
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 898b3319
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  898b3319
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 64c191aa
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  64c191aa
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 82dc9136
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn
```
  82dc9136
- test case ps requires binlog for now · 718314ff
  df@pippilotta.erinye.com authored May 31, 2007
  
  718314ff
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn · 4f81444f
  df@pippilotta.erinye.com authored May 31, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn
```
  4f81444f
- some test cases cannot run with --skip-log-bin · 779a055e
  df@pippilotta.erinye.com authored May 31, 2007
  
  779a055e
30 May, 2007 8 commits
- Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build · 05c51398
  kent@kent-amd64.(none) authored May 30, 2007
```
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
```
  05c51398
- Merge mysql.com:/home/kent/bk/tmp3/mysql-4.1-build · a1f0ff4b
  kent@kent-amd64.(none) authored May 30, 2007
```
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
```
  a1f0ff4b
- Makefile.am, configure.in: · b217a9e8
  kent@mysql.com/kent-amd64.(none) authored May 30, 2007
```
  Added --with-mysqld-libs configure flag
```
  b217a9e8
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · 2eb01e25
  df@pippilotta.erinye.com authored May 30, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  2eb01e25
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-17707 · 3584e6d2
  df@pippilotta.erinye.com authored May 30, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  3584e6d2
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-17707 · 407224f4
  df@pippilotta.erinye.com authored May 30, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  407224f4
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-nn · dd9afd5d
  df@pippilotta.erinye.com authored May 30, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  dd9afd5d
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-nn · 3b4fca2a
  df@pippilotta.erinye.com authored May 30, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  3b4fca2a
29 May, 2007 3 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-17707 · 9e27458c
  df@pippilotta.erinye.com authored May 29, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-17707
```
  9e27458c
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build-work-17707 · 82669a37
  df@pippilotta.erinye.com authored May 29, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-17707
```
  82669a37
- BUG#17707 check-cpu script doesn't include Turion · 1db91f16
  df@pippilotta.erinye.com authored May 29, 2007
  
  1db91f16
28 May, 2007 2 commits

kent@mysql.com/kent-amd64.(none) authored May 28, 2007

  Consistent use of '%::SCCS/s.%' to prevent some 'make'
  implementations from trying to update files in SCCS directory

870b38b8

configure.in: · 1d36bcab
kent@mysql.com/kent-amd64.(none) authored May 28, 2007
```
  After merge changes, removed unneeded Netware specific sprintf case
```
1d36bcab

27 May, 2007 1 commit

sql_parse.cc, config-win.h, config-netware.h: · a069db06

kent@mysql.com/kent-amd64.(none) authored May 27, 2007

  Don't try determine stack direction at configure time
compiler_flag.m4:
  Use AC_TRY_COMPILE and AC_TRY_LINK instead of AC_TRY_RUN where possible
misc.m4, configure.in:
  Use fourth argument to AC_TRY_RUN, to be used in cross compilation
  Don't try determine stack direction at configure time

a069db06

24 May, 2007 7 commits
- Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build · db9128f8
  joerg@trift2. authored May 24, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  db9128f8
- Makefile.am : Add "embedded" tests to the "test-bt" target. · 8592dfd9
  joerg@trift2. authored May 24, 2007
  
  8592dfd9
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · a390ac46
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  a390ac46
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 2120cb89
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  2120cb89
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work · d5422980
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  d5422980
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1 · 7459b4fc
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  7459b4fc
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · d29eaed8
  df@pippilotta.erinye.com authored May 24, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  d29eaed8