Commits · b69fd160c4a0c8bd24041e91bab7b4d4d7ee01a6 · nexedi / MariaDB

22 Jul, 2005 1 commit

unknown authored Jul 22, 2005


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Set up node group information as default if no node group info is
  passed in create table message.

b69fd160

21 Jul, 2005 19 commits

Fixed test cases for hash and linear hash and fixed guess in NDB API · 0a026e2d

unknown authored Jul 21, 2005

for this as well


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Fixed guess of proper transaction coordinator for NDB API users
storage/ndb/test/ndbapi/testPartitioning.cpp:
  Test case for both hash and linear hash

0a026e2d

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · fffa32cd

unknown authored Jul 21, 2005

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/AlterTable.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/DropTable.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/ndbapi/testBackup.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/listTables.cpp:
  Auto merged

fffa32cd

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · fbee7ef7
unknown authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push
```
fbee7ef7

Merge mysql.com:/home/jonas/src/mysql-5.0 · 3e30d36d

unknown authored Jul 21, 2005

into  mysql.com:/home/jonas/src/mysql-5.0-push


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

3e30d36d

Merge mysql.com:/home/jonas/src/mysql-4.1 · f8c1eebe

unknown authored Jul 21, 2005

into  mysql.com:/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

f8c1eebe

bug#11942 - ndb - backup during DDL · 9579eef5
unknown authored Jul 21, 2005
```
  fix bug introduced in alter table
```
9579eef5

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · f406d599

unknown authored Jul 21, 2005

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged

f406d599

Merge mysql.com:/usr/home/bar/mysql-4.1 · a0ee811e

unknown authored Jul 21, 2005

into  mysql.com:/usr/home/bar/mysql-5.0


BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged

a0ee811e

ctype-cp932.c: · 5ec16a50

unknown authored Jul 21, 2005

  After backporting from 5.0 fix.
  There is no an extra argument in 4.1.


strings/ctype-cp932.c:
  After backporting from 5.0 fix.
  There is no an extra argument in 4.1.

5ec16a50

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · cf4e25bc
unknown authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push


sql/ha_ndbcluster.cc:
  Auto merged
```
cf4e25bc
Included partitioning into embedded server · b98804b9
unknown authored Jul 21, 2005

b98804b9
Merge mysql.com:/home/jonas/src/mysql-5.0 · 60427b7e
unknown authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push
```
60427b7e
merge · 2ca791ae
unknown authored Jul 21, 2005

2ca791ae

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 99829029

unknown authored Jul 21, 2005

into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1


sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged

99829029

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 16579d0d

unknown authored Jul 21, 2005

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/handler.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged

16579d0d

Fix merge mistake · 8017fc6a
unknown authored Jul 21, 2005

8017fc6a

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · 03d00d6f

unknown authored Jul 21, 2005

into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


include/my_sys.h:
  Auto merged
include/thr_lock.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql-common/client.c:
  Auto merged
client/mysqldump.c:
  Manual merge
include/mysql.h:
  Manual merge
libmysql/libmysql.c:
  Manual merge
myisam/rt_split.c:
  Manual merge
mysys/thr_lock.c:
  Manual merge
sql/lock.cc:
  Manual merge
sql/mysql_priv.h:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge
tests/mysql_client_test.c:
  Manual merge

03d00d6f

Fix merge · 88a9b4b2
unknown authored Jul 20, 2005

88a9b4b2

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.0 · 1fc9c511

unknown authored Jul 20, 2005

into  c-450ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-4.1


include/thr_lock.h:
  Auto merged
mysys/thr_lock.c:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_table.cc:
  Manual merge after 4.0 fix

1fc9c511

20 Jul, 2005 20 commits

merge · cc2ce581

unknown authored Jul 21, 2005


sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged

cc2ce581

Bug #10600 After review fixes · 1b6ac530

unknown authored Jul 20, 2005


sql/lock.cc:
  Used flags immediately in call
sql/mysql_priv.h:
  Added RTFC (short for remove_table_from_cache)
  for constants and used hex syntax to clarify it is bits
  in the flags
sql/sql_base.cc:
  Use flags parameter immediately and use flags immediately in call
  Change to other variant of eternal loop variant
sql/sql_table.cc:
  Use flags immediately in call

1b6ac530

Merge bk-internal:/home/bk/mysql-5.0 · d82f6148
unknown authored Jul 20, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
d82f6148

Fix date conversion on 32-bit machines. · 2de1318c

unknown authored Jul 20, 2005


sql/field.cc:
  Fix type of temporary variables for handling result of
  number_to_datetime().

2de1318c

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 68e296e9
unknown authored Jul 20, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
```
68e296e9
Bug #12055 NDB temp tables created by ALTER TABLE are usable · 6dc61868
unknown authored Jul 20, 2005
```
- do not discover temporary files and make them visible
```
6dc61868

Upgraded the version number, as 5.0.10 is cloned off. · 790f530e

unknown authored Jul 20, 2005

This push includes the clone tag.


configure.in:
  Upgraded the version number, as 5.0.10 is cloned off.

790f530e

Implement MySQL framework to support consistent read views in · c4ff5981

unknown authored Jul 20, 2005

cursors. This should fix Bug#11813 when InnoDB part is in 
(tested with a draft patch).
The idea of the patch is that if a storage engine supports
consistent read views, we open one when open a cursor,
set is as the active view when fetch from the cursor, and close
together with cursor close.


sql/examples/ha_archive.cc:
  - extend handlerton with cursors methods; fix coding style
sql/examples/ha_example.cc:
  - extend handlerton with cursors methods; fix coding style
sql/examples/ha_tina.cc:
  - extend handlerton with cursors methods; fix coding style
sql/ha_berkeley.cc:
  - extend handlerton with cursors methods
sql/ha_blackhole.cc:
  - extend handlerton with cursors methods; fix coding style
sql/ha_federated.cc:
  - extend handlerton with cursors methods; fix coding style
sql/ha_heap.cc:
  - extend handlerton with cursors methods; fix coding style
sql/ha_innodb.cc:
  - extend handlerton with cursors methods
sql/ha_myisam.cc:
  - extend handlerton with cursors methods; fix coding style
sql/ha_myisammrg.cc:
  - extend handlerton with cursors methods; fix coding style
sql/ha_ndbcluster.cc:
  - extend handlerton with cursors methods
sql/handler.h:
  - extend handlerton with cursors methods
sql/sql_select.cc:
  - create a consistent read view when we open a cursor,
    set it for a fetch, and free when we closing the cursor.
sql/sql_select.h:
  - add Cursor::ht_info to remember read views used in a cursor.
tests/mysql_client_test.c:
  Disable an assert that will be no longer valid when consistent
  read views in InnoDB are used.

c4ff5981

Merge mysql.com:/home/jonas/src/mysql-5.0 · 72ec1af5
unknown authored Jul 20, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push
```
72ec1af5
merge · cd47305d
unknown authored Jul 20, 2005

cd47305d
no PARTITION in embedded server · bd9e2fe1
unknown authored Jul 20, 2005
```
mysql-test/r/partition_list.result:
  missed in last push
```
bd9e2fe1

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · d1e87d99

unknown authored Jul 20, 2005

into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/field.cc:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Makefile.am:
  Auto merged
strings/ctype-big5.c:
  Auto merged

d1e87d99

moved all partition create table error tests to one test for easier maintenance · ca0b6860
unknown authored Jul 20, 2005

ca0b6860

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 7c4886fd

unknown authored Jul 20, 2005

into  mysql.com:/home/jonas/src/mysql-5.0-push


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

7c4886fd

Merge grichter@bk-internal.mysql.com:/home/bk/mysql-4.1 · ca5c3f9b

unknown authored Jul 20, 2005

into lmy002.wdf.sap.corp:/home/georg/work/mysql/prod/mysql-4.1


tests/mysql_client_test.c:
  Auto merged

ca5c3f9b

cs fixes from last commit · 1462e0bc
unknown authored Jul 20, 2005

1462e0bc
Merge mysql.com:/home/jonas/src/mysql-5.0 · f516ebf9
unknown authored Jul 20, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push


sql/ha_ndbcluster.cc:
  Auto merged
```
f516ebf9

Merge mysql.com:/home/jonas/src/mysql-4.1 · 37b7e4c6

unknown authored Jul 20, 2005

into  mysql.com:/home/jonas/src/mysql-5.0


ndb/include/kernel/signaldata/DictTabInfo.hpp:
  Auto merged
ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
ndb/test/ndbapi/testBackup.cpp:
  Auto merged
ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/tools/drop_index.cpp:
  Auto merged
ndb/tools/listTables.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  merge
ndb/src/ndbapi/ndberror.c:
  merge
ndb/test/include/HugoOperations.hpp:
  merge
ndb/test/src/HugoOperations.cpp:
  merge

37b7e4c6

bug#11942 - ndb backup · 76538629

unknown authored Jul 20, 2005

  fix error code to avoid clash with 5.0/5.1


ndb/include/kernel/signaldata/AlterTable.hpp:
  Change error codes to remove clash from 5.0
ndb/include/kernel/signaldata/DropTable.hpp:
  Change error codes to remove clash from 5.0
ndb/src/ndbapi/ndberror.c:
  Change error codes to remove clash from 5.0

76538629

bug#11942 - ndb backup with parallell DDL · 60b06c95

unknown authored Jul 20, 2005

  add testcase to autotest


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  remove ;
ndb/test/run-test/daily-basic-tests.txt:
  add test case

60b06c95