Commits · 0f6030b17ebed6b8b9130f1cd9998c6c181cfb42 · Kirill Smelkov / mariadb

21 Jul, 2005 20 commits

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 · 0f6030b1
unknown authored Jul 21, 2005
```
into mysql.com:/M51/mysql-5.1


configure.in:
  Auto merged
```
0f6030b1
Increase the version to 5.1.1, as 5.1.0 has been cloned off. · 40d895d8
unknown authored Jul 21, 2005

40d895d8

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

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

5805fd26

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

Merge mysql.com:/home/jonas/src/mysql-5.0 · 8cf24577

unknown authored Jul 21, 2005

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


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

8cf24577

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

unknown authored Jul 21, 2005

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


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

c556acbf

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

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

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

bdf9d193

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

unknown authored Jul 21, 2005

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


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

718942d8

ctype-cp932.c: · e9687c10

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.

e9687c10

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


sql/ha_ndbcluster.cc:
  Auto merged
```
09e07ceb
Included partitioning into embedded server · 15424cb9
unknown authored Jul 21, 2005

15424cb9
Merge mysql.com:/home/jonas/src/mysql-5.0 · 83587008
unknown authored Jul 21, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push
```
83587008
merge · de5af58d
unknown authored Jul 21, 2005

de5af58d

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

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

51ddea89

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

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

b28ccd1b

Fix merge mistake · 2940168f
unknown authored Jul 21, 2005

2940168f

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 · 0b732c47

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

0b732c47

Fix merge · 31ebc6ef
unknown authored Jul 20, 2005

31ebc6ef

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

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

a3fe7652

20 Jul, 2005 20 commits

merge · 68c558ee

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

68c558ee

Bug #10600 After review fixes · af1dfb61

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

af1dfb61

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

Fix date conversion on 32-bit machines. · 8607be22

unknown authored Jul 20, 2005


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

8607be22

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

Upgraded the version number, as 5.0.10 is cloned off. · 45a43c21

unknown authored Jul 20, 2005

This push includes the clone tag.


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

45a43c21

Implement MySQL framework to support consistent read views in · ec55fec9

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.

ec55fec9

Merge mysql.com:/home/jonas/src/mysql-5.0 · 570cfc8e
unknown authored Jul 20, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push
```
570cfc8e
merge · fa22e389
unknown authored Jul 20, 2005

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

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

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

99358698

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

809fd0b2

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

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

7f984b92

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

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

21038e65

cs fixes from last commit · 6147be6e
unknown authored Jul 20, 2005

6147be6e
Merge mysql.com:/home/jonas/src/mysql-5.0 · fcb48236
unknown authored Jul 20, 2005
```
into  mysql.com:/home/jonas/src/mysql-5.0-push


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

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

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

6708dbdb

bug#11942 - ndb backup · fe073647

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

fe073647

bug#11942 - ndb backup with parallell DDL · e071abac

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

e071abac