Commits · 8ad4614bcd0c5d30b51a5d47d762a81e3db75cdd · nexedi / MariaDB

13 Apr, 2007 1 commit
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · 8ad4614b
  jani@a88-113-38-195.elisa-laajakaista.fi authored Apr 13, 2007
```
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.1-marvel
```
  8ad4614b
12 Apr, 2007 3 commits
- Added more descriptive error message of why statement was automaticly dropped · 6e8b72a6
  monty@mysql.com/narttu.mysql.fi authored Apr 13, 2007
```
Print information if net_clear() skipped bytes (As this otherwise hides critical timeing bugs)
Added DBUG_ASSERT if we get packets out of order
mysql_change_user() could on error send multiple packets, which caused mysql_client_test to randomly fail
```
  6e8b72a6
- Merge trift2.:/MySQL/M50/push-5.0 · 3f72507d
  joerg@trift2. authored Apr 12, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  3f72507d
- Merge trift2.:/MySQL/M41/push-4.1 · 3050edc0
  joerg@trift2. authored Apr 12, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  3050edc0
11 Apr, 2007 11 commits
- Fixed result. · 4a065f5f
  jani@ua141d10.elisa.omakaista.fi authored Apr 11, 2007
  
  4a065f5f
- don't copy pdb files from the release target output folder, since this target does not build them · 6d70fd87
  df@pippilotta.erinye.com authored Apr 11, 2007
  
  6d70fd87
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · 42499a47
  df@pippilotta.erinye.com authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  42499a47
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build · e3bfb956
  df@pippilotta.erinye.com authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  e3bfb956
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 · d09d2517
  df@pippilotta.erinye.com authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  d09d2517
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work-25601 · 4869a255
  df@pippilotta.erinye.com authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  4869a255
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-25601 · f98d1614
  df@pippilotta.erinye.com authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  f98d1614
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 · b51c3467
  df@pippilotta.erinye.com authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
```
  b51c3467
- make configure handle service pack version strings · d5f6363b
  df@pippilotta.erinye.com authored Apr 11, 2007
  
  d5f6363b
- Added warn_root as argument for push_back() · 77251d22
  jani@ua141d10.elisa.omakaista.fi authored Apr 11, 2007
  
  77251d22
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 7bff5112
  df@pippilotta.erinye.com authored Apr 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
```
  7bff5112
10 Apr, 2007 10 commits
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 · c92faf9d
  kent@mysql.com/kent-amd64.(none) authored Apr 11, 2007
```
into  mysql.com:/home/kent/bk/tmp3/mysql-4.1-build
```
  c92faf9d
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7e02bed9
  kent@mysql.com/kent-amd64.(none) authored Apr 11, 2007
```
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
```
  7e02bed9
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · d7286028
  kent@kent-amd64.(none) authored Apr 11, 2007
```
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
```
  d7286028
- Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build · 473b1f31
  kent@kent-amd64.(none) authored Apr 11, 2007
```
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
```
  473b1f31
- my_memmem.c: · 8bcdaa86
  kent@mysql.com/kent-amd64.(none) authored Apr 11, 2007
```
  Back port of include change and copyright from 5.1
Makefile.am, zlib.m4:
  Use separate libtool convenience library for the bundled
  zlib to embed into executables and shared libraries created,
  and one to install into the pkglib directory
```
  8bcdaa86
- Patch for displaying questions per second average correctly. · 3db7cdd5
  jani@ua141d10.elisa.omakaista.fi authored Apr 10, 2007
  
  3db7cdd5
- Small fixes for merge. · 1e38c22e
  jani@ua141d10.elisa.omakaista.fi authored Apr 10, 2007
  
  1e38c22e
- Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 · b4ba8159
  jani@ua141d10.elisa.omakaista.fi authored Apr 10, 2007
```
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
```
  b4ba8159
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-release · 5197d771
  df@pippilotta.erinye.com authored Apr 10, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
```
  5197d771
- add a manual page back · 8e7e7d6b
  df@pippilotta.erinye.com authored Apr 10, 2007
  
  8e7e7d6b
09 Apr, 2007 5 commits
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 26d2908c
  holyfoot/hf@hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  26d2908c
- Merge bk@192.168.21.1:mysql-5.0-opt · bd461b01
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  bd461b01
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 87daef26
  holyfoot/hf@hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  87daef26
- Merge bk@192.168.21.1:mysql-5.1 · 33ed2ead
  holyfoot/hf@hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  33ed2ead
- Merge bk@192.168.21.1:mysql-5.0 · 65535824
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 09, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.0-opt
```
  65535824
08 Apr, 2007 2 commits
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · a16289d5
  kent@kent-amd64.(none) authored Apr 08, 2007
```
into  mysql.com:/home/kent/bk/tmp4/mysql-5.1-engines
```
  a16289d5
- Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 · c282dd37
  kent@mysql.com/kent-amd64.(none) authored Apr 08, 2007
```
into  mysql.com:/home/kent/bk/tmp4/mysql-5.0-engines
```
  c282dd37
07 Apr, 2007 8 commits
- Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · d8e6b38e
  evgen@moonbone.local authored Apr 07, 2007
```
into  moonbone.local:/mnt/gentoo64/work/27586-bug-5.0-opt-mysql
```
  d8e6b38e
- merging fix · 171f8bad
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 08, 2007
  
  171f8bad
- Merge trift2.:/MySQL/M41/mysql-4.1 · da80df12
  joerg@trift2. authored Apr 07, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  da80df12
- Merge trift2.:/MySQL/M50/mysql-5.0 · 22f066e3
  joerg@trift2. authored Apr 07, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  22f066e3
- Merge trift2.:/MySQL/M51/mysql-5.1 · d77ab7a0
  joerg@trift2. authored Apr 07, 2007
```
into  trift2.:/MySQL/M51/push-5.1
```
  d77ab7a0
- after-merging fix · 7ceefd2b
  holyfoot/hf@mysql.com/hfmain.(none) authored Apr 07, 2007
  
  7ceefd2b
- Merge mysql.com:/home/hf/work/26074/my51-26074 · 6ffa4b9c
  holyfoot/hf@hfmain.(none) authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  6ffa4b9c
- Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · fa153792
  holyfoot/hf@hfmain.(none) authored Apr 07, 2007
```
into  mysql.com:/d2/hf/mrg/mysql-5.1-opt
```
  fa153792