Commits · f193dd22fe03744210c984c7a328eaf4c5a0ffaa · Kirill Smelkov / mariadb

02 Nov, 2007 8 commits
- Merge stella.local:/home2/mydev/mysql-4.1-axmrg · f193dd22
  istruewing@stella.local authored Nov 02, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  f193dd22
- Merge stella.local:/home2/mydev/mysql-5.0-ateam · 6e7c0f8a
  istruewing@stella.local authored Nov 02, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  6e7c0f8a
- Merge stella.local:/home2/mydev/mysql-4.1-ateam · 377f1870
  istruewing@stella.local authored Nov 02, 2007
```
into  stella.local:/home2/mydev/mysql-4.1-axmrg
```
  377f1870
- Merge stella.local:/home2/mydev/mysql-4.1-axmrg · 9cddfaf2
  istruewing@stella.local authored Nov 02, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  9cddfaf2
- Merge stella.local:/home2/mydev/mysql-5.0-amain · 7819ec9f
  istruewing@stella.local authored Nov 02, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  7819ec9f
- Bug#31030 - rpl000015.test fails if $MYSQL_TCP_PORT != 3306 · 8d4b8423
  istruewing@stella.local authored Nov 02, 2007
```
Preliminarily disabled test case
```
  8d4b8423
- Merge mysql.com:/home/svoj/devel/mysql/BUG11392/mysql-4.1-engines · 0ea269ca
  svoj@june.mysql.com authored Nov 02, 2007
```
into  mysql.com:/home/svoj/devel/mysql/BUG11392/mysql-5.0-engines
```
  0ea269ca
- Merge stella.local:/home2/mydev/mysql-4.1-amain · 82a27e84
  istruewing@stella.local authored Nov 02, 2007
```
into  stella.local:/home2/mydev/mysql-4.1-axmrg
```
  82a27e84
01 Nov, 2007 3 commits
- Merge stella.local:/home2/mydev/mysql-5.0-amain · fc888bc9
  istruewing@stella.local authored Nov 01, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  fc888bc9
- Post-merge fix · 1b165ef4
  istruewing@stella.local authored Nov 01, 2007
  
  1b165ef4
- Bug#31909 - New gis.test creates warnings files · 382f62b1
  istruewing@stella.local authored Nov 01, 2007
```
Comment sign of -- at line begin in test files lead to warnings
from mysqltest.

Changed -- to #.
```
  382f62b1
31 Oct, 2007 2 commits
- Merge stella.local:/home2/mydev/mysql-4.1-axmrg · 4998e0d8
  istruewing@stella.local authored Oct 31, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  4998e0d8
- Merge stella.local:/home2/mydev/mysql-5.0-amain · cd49a77a
  istruewing@stella.local authored Oct 31, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
  cd49a77a
30 Oct, 2007 5 commits
- Merge stella.local:/home2/mydev/mysql-4.1-amain · f3804912
  istruewing@stella.local authored Oct 31, 2007
```
into  stella.local:/home2/mydev/mysql-4.1-axmrg
```
  f3804912
- Makefile.am: · 2f88dce6
  kent@mysql.com/kent-amd64.(none) authored Oct 30, 2007
```
  Ensure use of libedit "config.h" by adding "-I. -I$(srcdir)" to DEFS,
  work around for problem with automake 1.10 (bug#24809)
```
  2f88dce6
- Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 220add03
  df@pippilotta.erinye.com authored Oct 30, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  220add03
- bug#30630 · e5b80933
  df@pippilotta.erinye.com authored Oct 30, 2007
  
  e5b80933
- BUG#11392 - fulltext search bug · cbd3dfbb
  svoj@mysql.com/june.mysql.com authored Oct 30, 2007
```
Fulltext boolean mode phrase search may crash server on platforms
where size of pointer is not equal to size of unsigned integer
(in other words some 64-bit platforms).

The problem was integer overflow.

Affects 4.1 only.
```
  cbd3dfbb
29 Oct, 2007 4 commits
- Merge trift2.:/MySQL/M41/push-4.1 · 9fee3fb6
  joerg@trift2. authored Oct 29, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  9fee3fb6
- Merge trift2.:/MySQL/M50/clone-5.0 · 007b4101
  joerg@trift2. authored Oct 29, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  007b4101
- Merge trift2.:/MySQL/M50/mysql-5.0 · 40872761
  joerg@trift2. authored Oct 29, 2007
```
into  trift2.:/MySQL/M50/push-5.0
```
  40872761
- Merge trift2.:/MySQL/M41/mysql-4.1 · 33f1f130
  joerg@trift2. authored Oct 29, 2007
```
into  trift2.:/MySQL/M41/push-4.1
```
  33f1f130
26 Oct, 2007 1 commit
- protect bug31473 from regressing into 5.0 · f9fc31f9
  antony@pcg5ppc.xiphis.org authored Oct 25, 2007
  
  f9fc31f9
25 Oct, 2007 2 commits
- Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build · 68a24d9f
  df@pippilotta.erinye.com authored Oct 25, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
```
  68a24d9f
- add new trigger to prevent certain naming clashes · 91fd0781
  df@pippilotta.erinye.com authored Oct 25, 2007
  
  91fd0781
24 Oct, 2007 3 commits
- Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines · 9f1d9bef
  svoj@june.mysql.com authored Oct 24, 2007
```
into  mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-5.0-engines
```
  9f1d9bef
- Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines · 0253d787
  svoj@mysql.com/june.mysql.com authored Oct 24, 2007
```
into  mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-engines
```
  0253d787
- BUG#31159 - fulltext search on ucs2 column crashes server · 5d1ccce5
  svoj@mysql.com/june.mysql.com authored Oct 24, 2007
```
ucs2 doesn't provide required by fulltext ctype array. Crash
happens because fulltext attempts to use unitialized ctype
array.

Fixed by converting ucs2 fields to compatible utf8 analogue.
```
  5d1ccce5
23 Oct, 2007 12 commits
- Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · 53b1c3a2
  gluh@eagle.(none) authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  53b1c3a2
- Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 237383f0
  gluh@eagle.(none) authored Oct 23, 2007
```
into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt
```
  237383f0
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · d0f53297
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
  d0f53297
- Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.0-opt · 17310895
  kaa@polly.(none) authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
  17310895
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 9934eec2
  gkodinov/kgeorge@magare.gmz authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
  9934eec2
- Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550 · 23c65a3b
  kaa@polly.(none) authored Oct 23, 2007
```
into  polly.(none):/home/kaa/src/opt/mysql-5.0-opt
```
  23c65a3b
- type conversions fixed to get rid of warnings · d029dd89
  holyfoot/hf@mysql.com/hfmain.(none) authored Oct 23, 2007
  
  d029dd89
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · bc80b863
  gkodinov/kgeorge@magare.gmz authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
  bc80b863
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 14c43b98
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
  14c43b98
- type conversion fixed to get rid of warnings · 36092b37
  holyfoot/hf@mysql.com/hfmain.(none) authored Oct 23, 2007
  
  36092b37
- Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 62737d6d
  gkodinov/kgeorge@magare.gmz authored Oct 23, 2007
```
into  magare.gmz:/home/kgeorge/mysql/autopush/B30825-new-5.0-opt
```
  62737d6d
- Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · 7fe41df0
  holyfoot/hf@hfmain.(none) authored Oct 23, 2007
```
into  mysql.com:/home/hf/work/30638/my50-30638
```
  7fe41df0