Commits · f50973451aa792759f8378f67e1047f4e2c1d6ea · Kirill Smelkov / mariadb

22 Nov, 2004 2 commits
- Merge mysql.com:/home/jonas/src/mysql-4.1-fix · f5097345
  joreland@mysql.com authored Nov 22, 2004
```
into mysql.com:/home/jonas/src/wl2077
```
  f5097345
- wl2077 - ndb, fix testDict · 3d845ad7
  joreland@mysql.com authored Nov 22, 2004
  
  3d845ad7
21 Nov, 2004 2 commits
- Merge mysql.com:/home/jonas/src/mysql-4.1-fix · df14eda7
  joreland@mysql.com authored Nov 21, 2004
```
into mysql.com:/home/jonas/src/wl2077
```
  df14eda7
- wl2077 - ndb close scan - fix introduced bugs wrt premature close of scan · 4d43c10f
  joreland@mysql.com authored Nov 21, 2004
  
  4d43c10f
19 Nov, 2004 22 commits
- Merge tulin@bk-internal.mysql.com:/tmp/my4.1-ndb · 0de3a280
  tomas@poseidon.ndb.mysql.com authored Nov 19, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
```
  0de3a280
- Merge · 744a18eb
  tomas@poseidon.ndb.mysql.com authored Nov 19, 2004
  
  744a18eb
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · eb3e306f
  tomas@poseidon.ndb.mysql.com authored Nov 19, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
  eb3e306f
- set sizes array sizes correctly in ndb blocks configuration · da7c9e26
  tomas@poseidon.ndb.mysql.com authored Nov 19, 2004
  
  da7c9e26
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 7805cb4d
  tomas@poseidon.ndb.mysql.com authored Nov 19, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
```
  7805cb4d
- Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 80fb79f5
  joreland@mysql.com authored Nov 19, 2004
```
into mysql.com:/home/jonas/src/wl2077
```
  80fb79f5
- wl2077: ndb, disable scanning of backup fragments · 56a59cf3
  joreland@mysql.com authored Nov 19, 2004
```
  (temporary)
```
  56a59cf3
- Merge joreland@bk-internal.mysql.com:/tmp/my4.1-ndb · 4dead3b6
  joreland@mysql.com authored Nov 19, 2004
```
into mysql.com:/home/jonas/src/wl2077
```
  4dead3b6
- Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 155265a7
  joreland@mysql.com authored Nov 19, 2004
```
into mysql.com:/home/jonas/src/wl2077
```
  155265a7
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8bfa05f2
  pekka@mysql.com authored Nov 19, 2004
```
into mysql.com:/space/pekka/ndb/version/my41
```
  8bfa05f2
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0e3c284b
  tomas@poseidon.ndb.mysql.com authored Nov 19, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
  0e3c284b
- Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 · f99d9807
  pekka@mysql.com authored Nov 19, 2004
```
into mysql.com:/space/pekka/ndb/version/my41
```
  f99d9807
- fixed error messages for some error codes · 2a984526
  tomas@poseidon.ndb.mysql.com authored Nov 19, 2004
  
  2a984526
- wl2077 - scan optimizations · b254e69a
  joreland@mysql.com authored Nov 19, 2004
```
(recommit in clean clone)
```
  b254e69a
- Reuse ctype_common.inc instead of retyping · 6de458c2
  bar@mysql.com authored Nov 19, 2004
```
the same queries.
```
  6de458c2
- wl2077 - ndb scan optimizations · 9e924a49
  joreland@mysql.com authored Nov 19, 2004
  
  9e924a49
- Incorrect response with partial utf8 index · f9d1a5a1
  bar@mysql.com authored Nov 19, 2004
  
  f9d1a5a1
- ignore fix · b67491ee
  tomas@poseidon.ndb.mysql.com authored Nov 19, 2004
  
  b67491ee
- added to ignore list · 73f09883
  tomas@poseidon.ndb.mysql.com authored Nov 19, 2004
  
  73f09883
- ha_ndbcluster.cc: · fdfc7311
  tomas@poseidon.ndb.mysql.com authored Nov 19, 2004
```
  merge error
```
  fdfc7311
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2048819f
  tomas@poseidon.ndb.mysql.com authored Nov 19, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
  2048819f
- ndb_grant.result, ndb_grant.test: · 287fe9e3
  tomas@poseidon.ndb.mysql.com authored Nov 19, 2004
```
  new file
```
  287fe9e3
18 Nov, 2004 14 commits
- log_event.cc: · 6c438ba9
  guilhem@mysql.com authored Nov 19, 2004
```
  post-conflict-merge fix (duplicate comment)
```
  6c438ba9
- moved ndb_use_transactions out of opts and to be set default true in THD::init · eb11d344
  tomas@poseidon.ndb.mysql.com authored Nov 18, 2004
  
  eb11d344
- merge error · 3a8a6d44
  tomas@poseidon.ndb.mysql.com authored Nov 18, 2004
  
  3a8a6d44
- Merge · 631f6f3c
  guilhem@mysql.com authored Nov 18, 2004
  
  631f6f3c
- Merge · bcd7f9a9
  tomas@poseidon.ndb.mysql.com authored Nov 18, 2004
  
  bcd7f9a9
- When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some... · 7743dbbb
  guilhem@mysql.com authored Nov 18, 2004
```
When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some customer would have benefited
much from this in his recovery. All this change does is adding one commented (#) line before the LOAD DATA
command, so it is quite innocuous.
```
  7743dbbb
- Merge · 2ec794a9
  tomas@poseidon.ndb.mysql.com authored Nov 18, 2004
  
  2ec794a9
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 22577e87
  tomas@poseidon.ndb.mysql.com authored Nov 18, 2004
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-clean
```
  22577e87
- Merge mysql.com:/home/jonas/src/mysql-4.1-fix · 15dab632
  joreland@mysql.com authored Nov 18, 2004
```
into mysql.com:/home/jonas/src/wl2077
```
  15dab632
- change file name to avoid conflict · 554ae233
  tomas@poseidon.ndb.mysql.com authored Nov 18, 2004
```
    corrected mistake in previous patch
```
  554ae233
- wl2077 - ndb scan optimizations · 64382cdc
  joreland@mysql.com authored Nov 18, 2004
  
  64382cdc
- bug#6677 bug#6684 · 21e8a090
  tomas@poseidon.ndb.mysql.com authored Nov 18, 2004
  
  21e8a090
- Some comments regarding Bug#6275 ""client_test" fail in 4.1.7 make test" · fec63062
  konstantin@mysql.com authored Nov 18, 2004
  
  fec63062
- adopted testprograms to changes in mgmapi · f30ce1ec
  tomas@poseidon.ndb.mysql.com authored Nov 18, 2004
  
  f30ce1ec