Commits · 7538f50498b495c22969e1b88cd5d4afbce7cf73 · Kirill Smelkov / mariadb

24 Nov, 2004 13 commits
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7538f504
  tomas@poseidon.ndb.mysql.com authored Nov 24, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
  7538f504
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · b276c66c
  tomas@poseidon.ndb.mysql.com authored Nov 24, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
  b276c66c
- Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 31a1d668
  joreland@mysql.com authored Nov 24, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1
```
  31a1d668
- Merged 4.0 change into 4.1 · 48db510b
  joerg@mysql.com authored Nov 24, 2004
  
  48db510b
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 436de3c8
  tomas@poseidon.ndb.mysql.com authored Nov 24, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
  436de3c8
- merge error · 5ac41f60
  joreland@mysql.com authored Nov 24, 2004
  
  5ac41f60
- Merge mysql.com:/home/jonas/src/wl2077 · fab3038d
  joreland@mysql.com authored Nov 24, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1
```
  fab3038d
- Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 482a446b
  joreland@mysql.com authored Nov 24, 2004
```
into mysql.com:/home/jonas/src/wl2077
```
  482a446b
- ndb - 4.1.8 is not online software upgradable with 4.1.7 (due to close scan optimizations) · 98c60c39
  joreland@mysql.com authored Nov 24, 2004
  
  98c60c39
- Merge mysql.com:/home/jonas/src/mysql-4.1-fix · c50c0691
  joreland@mysql.com authored Nov 24, 2004
```
into mysql.com:/home/jonas/src/wl2077
```
  c50c0691
- uca-dump.c: · 16113e81
  bar@mysql.com authored Nov 24, 2004
```
  Use less wide spaces on the primary level,
  to avoid big diff for ctype-uca.c.
```
  16113e81
- ndb - Add testcase to autotest · 97a2d6eb
  joreland@mysql.com authored Nov 24, 2004
  
  97a2d6eb
- ndb - debug printout · 0978d302
  joreland@mysql.com authored Nov 24, 2004
  
  0978d302
23 Nov, 2004 12 commits
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 93772e7a
  tomas@poseidon.ndb.mysql.com authored Nov 23, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
  93772e7a
- changed query cache type variable for ndb · ca61e54c
  tomas@poseidon.ndb.mysql.com authored Nov 23, 2004
  
  ca61e54c
- Change "Do-compile" to make automatic build log analysis easier and · 134aa0b9
  joerg@mysql.com authored Nov 23, 2004
```
to run the standard tests with "--force" (default, can be switched off).
```
  134aa0b9
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 1bcb1b9d
  serg@serg.mylan authored Nov 23, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  1bcb1b9d
- use FT_MAX_WORD_LEN_FOR_SORT instead of HA_FT_MAXBYTELEN when calculating · 48e7c9ab
  serg@serg.mylan authored Nov 23, 2004
```
preferred key block length for ft index
```
  48e7c9ab
- Delete: mysql-test/mysql_test_run.c · f88cf926
  wax@kishkin.ru authored Nov 23, 2004
  
  f88cf926
- Merge mysql.com:/home/wax/mysql/mysql-4.1 · 33226990
  wax@mysql.com authored Nov 23, 2004
```
into mysql.com:/home/wax/mysql/mysql-4.1bug
```
  33226990
- rename event_connect_request to smem_event_connect_request · cfb82e9e
  wax@kishkin.ru authored Nov 23, 2004
  
  cfb82e9e
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · ee54423a
  pekka@mysql.com authored Nov 23, 2004
```
into mysql.com:/space/pekka/ndb/version/my41
```
  ee54423a
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 49b02a8f
  tomas@poseidon.ndb.mysql.com authored Nov 23, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
  49b02a8f
- enabling control of query cache for ndb · 33c05ce9
  tomas@poseidon.ndb.mysql.com authored Nov 23, 2004
  
  33c05ce9
- small bug fix for ndb restarter · cb7563b0
  tomas@poseidon.ndb.mysql.com authored Nov 23, 2004
  
  cb7563b0
22 Nov, 2004 15 commits
- merged · 2ca5a0f2
  serg@serg.mylan authored Nov 22, 2004
  
  2ca5a0f2
- "Table file %s was created in MySQL 4.1+" is an error, not a warning · b7aa9815
  serg@serg.mylan authored Nov 22, 2004
  
  b7aa9815
- Bug#6252 - Duplicate columns in keys should fail · 076f2714
  antony@ltantony.rdg.cyberkinetica.homeunix.net authored Nov 22, 2004
```
  Added check for duplicate column in key
  Added tests and fixed tests which exploit bug
```
  076f2714
- merged with ul · eb8d9d3f
  serg@serg.mylan authored Nov 22, 2004
  
  eb8d9d3f
- ndb: fix blob performance in long transactions · 37f0ff9b
  pekka@mysql.com authored Nov 22, 2004
  
  37f0ff9b
- Merge bk-internal:/home/bk/mysql-4.0/ · af51d262
  serg@serg.mylan authored Nov 22, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
```
  af51d262
- ft_boolean_search.c: · dca2182f
  serg@serg.mylan authored Nov 22, 2004
```
  bug#6705 - (+trunc1* +trunc2*)
fulltext.test, fulltext.result:
  bug#6705
```
  dca2182f
- Merge mysql.com:/space/my/mysql-4.1 · e72acc42
  lenz@mysql.com authored Nov 22, 2004
```
into mysql.com:/space/my/mysql-4.1-build
```
  e72acc42
- - renamed mysqladmin.c -> mysqladmin.cpp to fix the Windows builds · 51e18c21
  lenz@mysql.com authored Nov 22, 2004
  
  51e18c21
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2e63f22a
  tomas@poseidon.ndb.mysql.com authored Nov 22, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
```
  2e63f22a
- Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 4edd0f3a
  serg@serg.mylan authored Nov 22, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
  4edd0f3a
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 77a58fb7
  tomas@poseidon.ndb.mysql.com authored Nov 22, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
```
  77a58fb7
- added --no-defaults to ndb_drop_table in autodiscover test · a487b879
  tomas@poseidon.ndb.mysql.com authored Nov 22, 2004
  
  a487b879
- Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 816fe259
  joreland@mysql.com authored Nov 22, 2004
```
into mysql.com:/home/jonas/src/wl2077
```
  816fe259
- wl2077 - bug fix for SCAN_TABREF · f7fb4072
  joreland@mysql.com authored Nov 22, 2004
  
  f7fb4072