Commits · 0e3537a06b7f2c4a4cbc59947ba99d3a77124ad4 · nexedi / MariaDB

16 Sep, 2004 1 commit
- ndb charsets: metadata in TUP, TUX · 0e3537a0
  unknown authored Sep 16, 2004
  
  0e3537a0
15 Sep, 2004 25 commits

Merge · 6961ac2e

unknown authored Sep 15, 2004


ndb/test/src/NDBT_Test.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/restore/main.cpp:
  Auto merged
ndb/test/ndbapi/testBackup.cpp:
  Auto merged
ndb/tools/select_all.cpp:
  SCCS merged

6961ac2e

HugoTransactions.cpp · 424295f9

unknown authored Sep 15, 2004

    changed to do execute(commit);restart() transaction instead of closeTransaction();start new
select_all.cpp
    moved my_init outside DBUG_OFF


ndb/test/src/HugoTransactions.cpp:
  changed to do execute(commit);restart() transaction instead of closeTransaction();start new
ndb/tools/select_all.cpp:
  moved my_init outside DBUG_OFF

424295f9

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 08c8a829
unknown authored Sep 15, 2004
```
into poseidon.(none):/home/tomas/mysql-4.1-ndb
```
08c8a829

testBank · 47d3c618

unknown authored Sep 15, 2004

    optimized for fewer timeouts
    changed for consistency in "time"
tests
    moved SR_UNDO tests to basic
    added testBackup -n BackupBank


ndb/test/ndbapi/bank/Bank.cpp:
  optimized for fewer timeouts
  changed for consistency in "time"
ndb/test/ndbapi/bank/Bank.hpp:
  optimized for fewer timeouts
  changed for consistency in "time"
ndb/test/run-test/daily-basic-tests.txt:
  moved SR_UNDO tests to basic
ndb/test/run-test/daily-devel-tests.txt:
  moved SR_UNDO tests to basic
  added testBackup -n BackupBank

47d3c618

fixed return code for ndb_backup · fd5c8453

unknown authored Sep 15, 2004

added possibility to set number of accounts in createAndLoadBank
bumbed up number of threads in tastBackup BackupBank


ndb/src/kernel/blocks/backup/restore/main.cpp:
  fixed return code
ndb/test/ndbapi/bank/Bank.hpp:
  added possibility to set number of accounts in createAndLoadBank
ndb/test/ndbapi/bank/BankLoad.cpp:
  added possibility to set number of accounts in createAndLoadBank
ndb/test/ndbapi/testBackup.cpp:
  bumbed up number of threads in tastBackup BackupBank
ndb/test/src/NdbBackup.cpp:
  some small optimizations

fd5c8453

ndb charsets: DICT · 36bdf4f9
unknown authored Sep 15, 2004

36bdf4f9
drop table after test (if created & success) · 2e60d37d
unknown authored Sep 15, 2004
```
ndb/test/ndbapi/testLcp.cpp:
  Remove diskdata stuff
```
2e60d37d
Merge mysql.com:/home/jonas/src/mysql-4.1 · aee58edd
unknown authored Sep 15, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1-ndb
```
aee58edd
New test prg, testLcp · e67097fe
unknown authored Sep 15, 2004
```
ndb/test/ndbapi/Makefile.am:
  New test prg
```
e67097fe
Merge mysql.com:/home/jonas/src/mysql-4.1 · 4280b3f5
unknown authored Sep 15, 2004
```
into mysql.com:/home/jonas/src/mysql-4.1-ndb
```
4280b3f5
ndb: set column type sets column defaults · b82dede5
unknown authored Sep 15, 2004

b82dede5
fixed bug in bank · 861165e8
unknown authored Sep 15, 2004

861165e8
delete unnecessary include my_sys.h · 4f5bbc54
unknown authored Sep 15, 2004

4f5bbc54

Fix the test case to make it more predictable (cause: 4.1.5 test failure · 057f6b6f

unknown authored Sep 15, 2004

on intelxeon3 (Solaris x86))


mysql-test/r/ps_2myisam.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_3innodb.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_4heap.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_5merge.result:
  Test results fixed (order by for a couple of statements in the PS test).
mysql-test/r/ps_6bdb.result:
  Test results fixed (order by for a couple of statements in the PS test).

057f6b6f

A fix (bug #5540: CONCAT function and 'double' type). · 5eb1bc39
unknown authored Sep 15, 2004

5eb1bc39

ndb_init() to all ndb programs · 3664c673

unknown authored Sep 15, 2004


ndb/examples/ndbapi_async_example/ndbapi_async.cpp:
  ndb_init()
ndb/examples/ndbapi_example1/ndbapi_example1.cpp:
  ndb_init()
ndb/examples/ndbapi_example2/ndbapi_example2.cpp:
  ndb_init()
ndb/examples/ndbapi_example3/ndbapi_example3.cpp:
  ndb_init()
ndb/examples/ndbapi_example4/ndbapi_example4.cpp:
  ndb_init()
ndb/examples/ndbapi_example5/ndbapi_example5.cpp:
  ndb_init()
ndb/examples/ndbapi_scan_example/ndbapi_scan.cpp:
  ndb_init()
ndb/examples/select_all/select_all.cpp:
  ndb_init()
ndb/include/ndb_global.h:
  ndb_init()
ndb/src/common/util/Makefile.am:
  ndb_init()
ndb/src/kernel/blocks/backup/read.cpp:
  ndb_init()
ndb/src/kernel/blocks/backup/restore/main.cpp:
  ndb_init()
ndb/src/kernel/main.cpp:
  ndb_init()
ndb/src/kernel/vm/Configuration.cpp:
  ndb_init()
ndb/src/mgmclient/main.cpp:
  ndb_init()
ndb/src/mgmsrv/main.cpp:
  ndb_init()
ndb/src/mgmsrv/mkconfig/mkconfig.cpp:
  ndb_init()
ndb/src/ndbapi/Ndbinit.cpp:
  ndb_init()
ndb/test/ndbapi/acid.cpp:
  ndb_init()
ndb/test/ndbapi/acid2.cpp:
  ndb_init()
ndb/test/ndbapi/benchronja.cpp:
  ndb_init()
ndb/test/ndbapi/bulk_copy.cpp:
  ndb_init()
ndb/test/ndbapi/cdrserver.cpp:
  ndb_init()
ndb/test/ndbapi/celloDb.cpp:
  ndb_init()
ndb/test/ndbapi/create_all_tabs.cpp:
  ndb_init()
ndb/test/ndbapi/create_tab.cpp:
  ndb_init()
ndb/test/ndbapi/drop_all_tabs.cpp:
  ndb_init()
ndb/test/ndbapi/flexAsynch.cpp:
  ndb_init()
ndb/test/ndbapi/flexBench.cpp:
  ndb_init()
ndb/test/ndbapi/flexHammer.cpp:
  ndb_init()
ndb/test/ndbapi/flexScan.cpp:
  ndb_init()
ndb/test/ndbapi/flexTT.cpp:
  ndb_init()
ndb/test/ndbapi/flexTimedAsynch.cpp:
  ndb_init()
ndb/test/ndbapi/flex_bench_mysql.cpp:
  ndb_init()
ndb/test/ndbapi/index.cpp:
  ndb_init()
ndb/test/ndbapi/index2.cpp:
  ndb_init()
ndb/test/ndbapi/initronja.cpp:
  ndb_init()
ndb/test/ndbapi/interpreterInTup.cpp:
  ndb_init()
ndb/test/ndbapi/mainAsyncGenerator.cpp:
  ndb_init()
ndb/test/ndbapi/msa.cpp:
  ndb_init()
ndb/test/ndbapi/restarter.cpp:
  ndb_init()
ndb/test/ndbapi/restarter2.cpp:
  ndb_init()
ndb/test/ndbapi/restarts.cpp:
  ndb_init()
ndb/test/ndbapi/size.cpp:
  ndb_init()
ndb/test/ndbapi/slow_select.cpp:
  ndb_init()
ndb/test/ndbapi/testBackup.cpp:
  ndb_init()
ndb/test/ndbapi/testBasic.cpp:
  ndb_init()
ndb/test/ndbapi/testBasicAsynch.cpp:
  ndb_init()
ndb/test/ndbapi/testBlobs.cpp:
  ndb_init()
ndb/test/ndbapi/testDataBuffers.cpp:
  ndb_init()
ndb/test/ndbapi/testDeadlock.cpp:
  ndb_init()
ndb/test/ndbapi/testDict.cpp:
  ndb_init()
ndb/test/ndbapi/testGrep.cpp:
  ndb_init()
ndb/test/ndbapi/testGrepVerify.cpp:
  ndb_init()
ndb/test/ndbapi/testIndex.cpp:
  ndb_init()
ndb/test/ndbapi/testInterpreter.cpp:
  ndb_init()
ndb/test/ndbapi/testMgm.cpp:
  ndb_init()
ndb/test/ndbapi/bank/bankCreator.cpp:
  ndb_init()
ndb/test/ndbapi/bank/bankMakeGL.cpp:
  ndb_init()
ndb/test/ndbapi/bank/bankSumAccounts.cpp:
  ndb_init()
ndb/test/ndbapi/bank/bankTimer.cpp:
  ndb_init()
ndb/test/ndbapi/bank/bankTransactionMaker.cpp:
  ndb_init()
ndb/test/ndbapi/bank/bankValidateAllGLs.cpp:
  ndb_init()
ndb/test/ndbapi/bank/testBank.cpp:
  ndb_init()
ndb/test/ndbapi/testNdbApi.cpp:
  ndb_init()
ndb/test/ndbapi/testNodeRestart.cpp:
  ndb_init()
ndb/test/ndbapi/testOIBasic.cpp:
  ndb_init()
ndb/test/ndbapi/testOperations.cpp:
  ndb_init()
ndb/test/ndbapi/testOrderedIndex.cpp:
  ndb_init()
ndb/test/ndbapi/testReadPerf.cpp:
  ndb_init()
ndb/test/ndbapi/testRestartGci.cpp:
  ndb_init()
ndb/test/ndbapi/testScan.cpp:
  ndb_init()
ndb/test/ndbapi/testScanInterpreter.cpp:
  ndb_init()
ndb/test/ndbapi/testScanPerf.cpp:
  ndb_init()
ndb/test/ndbapi/testSystemRestart.cpp:
  ndb_init()
ndb/test/ndbapi/testTimeout.cpp:
  ndb_init()
ndb/test/ndbapi/testTransactions.cpp:
  ndb_init()
ndb/test/ndbapi/test_event.cpp:
  ndb_init()
ndb/test/run-test/main.cpp:
  ndb_init()
ndb/test/src/NDBT_Test.cpp:
  ndb_init()
ndb/test/tools/copy_tab.cpp:
  ndb_init()
ndb/test/tools/cpcc.cpp:
  ndb_init()
ndb/test/tools/create_index.cpp:
  ndb_init()
ndb/test/tools/hugoCalculator.cpp:
  ndb_init()
ndb/test/tools/hugoFill.cpp:
  ndb_init()
ndb/test/tools/hugoLoad.cpp:
  ndb_init()
ndb/test/tools/hugoLockRecords.cpp:
  ndb_init()
ndb/test/tools/hugoPkDelete.cpp:
  ndb_init()
ndb/test/tools/hugoPkRead.cpp:
  ndb_init()
ndb/test/tools/hugoPkReadRecord.cpp:
  ndb_init()
ndb/test/tools/hugoPkUpdate.cpp:
  ndb_init()
ndb/test/tools/hugoScanRead.cpp:
  ndb_init()
ndb/test/tools/hugoScanUpdate.cpp:
  ndb_init()
ndb/test/tools/restart.cpp:
  ndb_init()
ndb/test/tools/transproxy.cpp:
  ndb_init()
ndb/test/tools/verify_index.cpp:
  ndb_init()
ndb/tools/delete_all.cpp:
  ndb_init()
ndb/tools/desc.cpp:
  ndb_init()
ndb/tools/drop_index.cpp:
  ndb_init()
ndb/tools/drop_tab.cpp:
  ndb_init()
ndb/tools/listTables.cpp:
  ndb_init()
ndb/tools/ndbsql.cpp:
  ndb_init()
ndb/tools/select_all.cpp:
  ndb_init()
ndb/tools/select_count.cpp:
  ndb_init()
ndb/tools/waiter.cpp:
  ndb_init()

3664c673

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 8858000f
unknown authored Sep 15, 2004
```
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5546
```
8858000f
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 · f7b832a8
unknown authored Sep 15, 2004
```
into mysql.com:/usr/home/bar/mysql-4.1
```
f7b832a8
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 6a573bc7
unknown authored Sep 15, 2004
```
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b5546
```
6a573bc7

CommandInterpreter.cpp: · 9d46fb1b

unknown authored Sep 15, 2004

  removed help text for non implemented command


ndb/src/mgmclient/CommandInterpreter.cpp:
  removed help text for non implemented command

9d46fb1b

fixed cosmetic printouts · 41854336
unknown authored Sep 15, 2004

41854336
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 5f156dbd
unknown authored Sep 15, 2004
```
into poseidon.(none):/home/tomas/mysql-4.1-ndb
```
5f156dbd

mysql.cc: · 2c742dba

unknown authored Sep 15, 2004

  SQL_SELECT_LIMIT=0 protection


client/mysql.cc:
  SQL_SELECT_LIMIT=0 protection

2c742dba

bug, forgot to set to zero · a94d16fd
unknown authored Sep 15, 2004

a94d16fd
Restoring old code to be used with 4.0 server if 4.1-compient query fails. · 63bb0212
unknown authored Sep 15, 2004
```
Restoring displaying database and user which was removed in a mistake
in the previous change.
```
63bb0212

14 Sep, 2004 14 commits

Fix the test case for bug#4231 (which before was passing just by occasion) · 09ee231c
unknown authored Sep 15, 2004

09ee231c
Fix warnings reported by aclocal > 1.8 (Underquoted definition of ...) · a8bb112e
unknown authored Sep 15, 2004
```
acinclude.m4:
  Fix warnings reported by aclocal > 1.8
configure.in:
  Fix warnings reported by aclocal > 1.8
```
a8bb112e
Merge mysql.com:/home/mydev/mysql-4.1 · 97d39671
unknown authored Sep 14, 2004
```
into mysql.com:/home/mydev/mysql-4.1-bug5318
```
97d39671
Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 · 447091f7
unknown authored Sep 14, 2004
```
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.1
```
447091f7
fix to make transaction failure also affect select count() on other tables in thread · bf903e13
unknown authored Sep 14, 2004

bf903e13

Added testcase for select count() during transaction with failures · ccddfc8e

unknown authored Sep 14, 2004

added fix for keeping "records" up to date when execute() fails


mysql-test/r/ndb_insert.result:
  Added testcase for select count() during transaction with failures
mysql-test/t/ndb_insert.test:
  Added testcase for select count() during transaction with failures
sql/ha_ndbcluster.cc:
  added fix for keeping "records" up to date when execute() fails
sql/ha_ndbcluster.h:
  added fix for keeping "records" up to date when execute() fails

ccddfc8e

code clean-up · 764600d1
unknown authored Sep 14, 2004
```
sql/sql_repl.cc:
  code clean-up: we can use thd here.
```
764600d1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · d2774080
unknown authored Sep 14, 2004
```
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
```
d2774080
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb · 7a68a4ba
unknown authored Sep 14, 2004
```
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
```
7a68a4ba

new method to set size of local table data · de9882e3

unknown authored Sep 14, 2004

clearer configure description texts
changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
move definition if Thd_ndb to .h file and changes seize/release to operate on Thd_ndb instead of Ndb objects
moved allocation/deletion of Ndb objects to Thd_ndb


ndb/include/ndbapi/NdbDictionary.hpp:
  new method to set size of local table data
ndb/src/mgmsrv/ConfigInfo.cpp:
  clearer configure description texts
ndb/src/ndbapi/DictCache.cpp:
  changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
ndb/src/ndbapi/DictCache.hpp:
  changed Ndb_local_table_info to use create, destroy metods and hidden constructor/destructor
ndb/src/ndbapi/NdbDictionary.cpp:
  new method to set size of local table data
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  new method to set size of local table data
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  new method to set size of local table data
sql/ha_ndbcluster.cc:
  new method to set size of local table data
  moved allocation/deletion of Ndb objects to Thd_ndb
sql/ha_ndbcluster.h:
  move definition if Thd_ndb to .h file and changes seize/release to operate on Thd_ndb instead of Ndb objects

de9882e3

A fix (bug #5546: mysqld crash on PURGE MASTER LOGS BEFORE '...' with log-bin off). · 2c9990dd
unknown authored Sep 14, 2004

2c9990dd
Merge mysql.com:/home/mydev/mysql-4.1 · b993de89
unknown authored Sep 14, 2004
```
into mysql.com:/home/mydev/mysql-4.1-bug5318
```
b993de89

BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT. · efba2225

unknown authored Sep 14, 2004

Added a check to recover from IGNORE_SPACE in this situation: 
<ident-character(s)><space><dot><ident-character(s)>
The ignored space led to the false identification of the dot
as an ident separator (like "db.table").


mysql-test/r/sql_mode.result:
  BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
  Added the test results.
mysql-test/t/sql_mode.test:
  BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
  Added new tests for the bug.
sql/sql_lex.cc:
  BUG#5318 - failure: 'IGNORE_SPACE' affects numeric values after DEFAULT.
  Added code to recover from skipped spaces in mode IGNORE_SPACES,
  when testing for an ident separator (which happens to be a dot).

efba2225

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1 · 92cca4f0
unknown authored Sep 14, 2004
```
into mysql.com:/M41/mysql-4.1
```
92cca4f0