Commits · 5c5cf8c4653451dd430ddd15247297d75967ecb0 · nexedi / MariaDB

27 Aug, 2004 2 commits

small fixes of select count(*) · 5c5cf8c4

unknown authored Aug 27, 2004


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fix init
ndb/tools/select_count.cpp:
  row count is 64 bit

5c5cf8c4

Added 3 psuedo columns · fa5d6ac3

unknown authored Aug 27, 2004

Cleaned up code
Changed ndb_select_all


ndb/include/kernel/AttributeHeader.hpp:
  Added commit count to psuedo columns
  Added bit for psuedo columns
ndb/include/kernel/GlobalSignalNumbers.h:
  Changed into READ_PSUEDO
ndb/include/ndbapi/NdbDictionary.hpp:
  Added 3 psuedo columns
ndb/include/ndbapi/NdbOperation.hpp:
  Added 3 psuedo columns
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Changed into READ_PSUEDO
  Added commit count
ndb/src/ndbapi/NdbDictionary.cpp:
  Added 3 psuedo columns
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Added 3 psuedo columns
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Added 3 psuedo columns
ndb/src/ndbapi/NdbOperation.cpp:
  Added 3 psuedo columns
ndb/tools/select_count.cpp:
  Changed select_count into using new features

fa5d6ac3

25 Aug, 2004 20 commits

Merge mysql.com:/home/jonas/src/mysql-4.1-ndb · 40358d1a

unknown authored Aug 25, 2004

into mysql.com:/home/jonas/src/wl2025


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

40358d1a

Improved STR_VALUE macro · 3621ff8c
unknown authored Aug 25, 2004

3621ff8c
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · e387719d
unknown authored Aug 25, 2004
```
into mysql.com:/Users/mikron/mysql-4.1-ndb
```
e387719d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 6fe88305
unknown authored Aug 25, 2004
```
into poseidon.(none):/home/tomas/mysql-4.1-ndb
```
6fe88305

small fixes, see respective file · 926a055e

unknown authored Aug 25, 2004


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  removed debug code
ndb/src/mgmsrv/main.cpp:
  changed to use my_init and some help test changes

926a055e

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · a95fd2d9

unknown authored Aug 25, 2004

into poseidon.(none):/home/tomas/mysql-4.1-ndb


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged

a95fd2d9

added some debug support · bbe1033a
unknown authored Aug 25, 2004
```
and some more checks
```
bbe1033a

merge · db2343e8

unknown authored Aug 25, 2004


BitKeeper/etc/logging_ok:
  auto-union
ndb/include/mgmapi/mgmapi_config_parameters.h:
  Auto merged
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged

db2343e8

Removed "string" values and use STR_VALUE instead · dc897936
unknown authored Aug 25, 2004

dc897936

Missing ; · 6a4bbfe8

unknown authored Aug 25, 2004

Duplicate lib dep


ndb/src/kernel/vm/Configuration.cpp:
  Missing ;
ndb/src/mgmsrv/Makefile.am:
  Duplicate lib dep

6a4bbfe8

Merge mysql.com:/Users/mikron/mysql-4.1 · be745ea4

unknown authored Aug 25, 2004

into mysql.com:/Users/mikron/mysql-4.1-ndb


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

be745ea4

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · 69e53670
unknown authored Aug 25, 2004
```
into mysql.com:/Users/mikron/mysql-4.1


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
```
69e53670
Merge mysql.com:/Volumes/Backup1/wl2056 · d0a06b6f
unknown authored Aug 25, 2004
```
into mysql.com:/Users/mikron/wl2056
```
d0a06b6f
Adaptions after review · c007ffdd
unknown authored Aug 25, 2004

c007ffdd

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 64a5170b

unknown authored Aug 25, 2004

into mysql.com:/Volumes/Backup1/wl2056


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

64a5170b

Fixing an issue with using UNDEFINED as default parameter value · 777cd0e3
unknown authored Aug 25, 2004
```
which means that the ndbd process will not know anything about the
value
```
777cd0e3

mysql.cc: · b20d1ce4

unknown authored Aug 25, 2004

  Bug#3453: MySQL output formatting in multibyte character sets


client/mysql.cc:
  Bug#3453: MySQL output formatting in multibyte character sets

b20d1ce4

merge count(*) optim with wl2025 · 00ca62f0

unknown authored Aug 25, 2004


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged

00ca62f0

A new function to meassure terminal screen cells number for a string. · f0fed746
unknown authored Aug 25, 2004

f0fed746
utr11-dump.c: · 51fd9ed4
unknown authored Aug 25, 2004
```
  new file
```
51fd9ed4

24 Aug, 2004 18 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 4797675a
unknown authored Aug 25, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1-ndb
```
4797675a

minor fixes · c6216b12

unknown authored Aug 24, 2004


mysql-test/r/ndb_blob.result:
  fixed result for ndb_blob.test
ndb/src/ndbapi/Ndb.cpp:
  added some debug calls

c6216b12

Merge · 8bb0aaa5

unknown authored Aug 24, 2004


acinclude.m4:
  Auto merged
configure.in:
  Auto merged
ndb/src/common/mgmcommon/ConfigInfo.hpp:
  Auto merged
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
  Auto merged
mysql-test/ndb/ndb_config_2_node.ini:
  SCCS merged
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  SCCS merged

8bb0aaa5

ndb config ability/naming changes, see respective file · 9f2b7e91

unknown authored Aug 24, 2004


mysql-test/ndb/ndb_config_2_node.ini:
  using new naming capabilities
ndb/src/common/mgmcommon/ConfigInfo.cpp:
  fixes case insensitive
  + removed abort from config handling
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
  fixed alias handling
  some requires in config handling
ndb/src/mgmclient/CommandInterpreter.cpp:
  new printout to reflect new naming in config

9f2b7e91

Implemented general purpose psuedo columns: row_count & fragment · d2c8f1a7

unknown authored Aug 24, 2004

Implemented new interpreter instruction: exit_ok_last

This two new features combined can be used to make fast select count
 


ndb/include/kernel/AttributeHeader.hpp:
  Psuedo columns fragment & row_count
ndb/include/kernel/GlobalSignalNumbers.h:
  Impl. READ_ROWCOUNT
ndb/include/kernel/signaldata/TupKey.hpp:
  Remove unused pageId pageIndex and replace with lastRow flag
ndb/include/ndbapi/NdbOperation.hpp:
  New instruction for last_row
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dbacc/DbaccInit.cpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  REQ_ROWCOUNT + last row
ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  REQ_ROWCOUNT
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  REQ_ROWCOUNT + last row
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add readers for new psuedo columns
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Add readers for new psuedo columns
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Add readers for new psuedo columns
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Use exit ok (not ok_last)
ndb/src/ndbapi/NdbOperationExec.cpp:
  Use exit ok (not ok_last)
ndb/src/ndbapi/NdbOperationInt.cpp:
  New instruction

d2c8f1a7

Cleaned up rnd_init · 340d40a7
unknown authored Aug 24, 2004

340d40a7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 92dfd1bf
unknown authored Aug 24, 2004
```
into poseidon.(none):/home/tomas/mysql-4.1-clean
```
92dfd1bf

more aliases in ndb config · b7a13b55

unknown authored Aug 24, 2004


ndb/src/common/mgmcommon/ConfigInfo.cpp:
  more aliases
ndb/src/common/mgmcommon/InitConfigFileParser.cpp:
  oops bug

b7a13b55

compatibility fixes · 5b1c2dec

unknown authored Aug 24, 2004


client/mysql.cc:
  removed readline-4.2 compatibility fix
  readline 4.2 is broken, use 4.2a instead
cmd-line-utils/libedit/search.c:
  regex.h fix
acinclude.m4:
  removed readline-4.2 compatibility fix
  readline 4.2 is broken, use 4.2a instead

5b1c2dec

Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 5aca69d9
unknown authored Aug 24, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
```
5aca69d9
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 2ce9f883
unknown authored Aug 24, 2004
```
into poseidon.(none):/home/tomas/mysql-4.1-clean
```
2ce9f883
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 76a9aeb7
unknown authored Aug 24, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_select.cc:
  Auto merged
```
76a9aeb7
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 89b7c75f
unknown authored Aug 25, 2004
```
into mysql.com:/media/sda1/mysql/mysql-4.1-5034
```
89b7c75f
committed skipped file · aa8a12fe
unknown authored Aug 25, 2004

aa8a12fe
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ · 5e85c284
unknown authored Aug 24, 2004
```
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


BitKeeper/etc/ignore:
  auto-union
```
5e85c284
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 16a364f5
unknown authored Aug 25, 2004
```
into mysql.com:/media/sda1/mysql/mysql-4.1-5034
```
16a364f5

Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6564806b

unknown authored Aug 25, 2004

into eagle.mysql.r18.ru:/home/vva/work/BUG_libedit/mysql-4.1.clear


acinclude.m4:
  Auto merged
configure.in:
  Auto merged

6564806b

bug fix · 4cf158b0
unknown authored Aug 24, 2004

4cf158b0