Commits · a9ba149a4ffbcdd925ccf83de8910e103fb828b2 · nexedi / MariaDB

14 Jun, 2005 1 commit

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

unknown authored Jun 14, 2005

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


BitKeeper/etc/logging_ok:
  auto-union
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testTimeout.cpp:
  Auto merged

a9ba149a

13 Jun, 2005 32 commits

merge · 7bb5fe94

unknown authored Jun 14, 2005


BitKeeper/etc/logging_ok:
  auto-union
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged

7bb5fe94

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 91a7d4e7
unknown authored Jun 13, 2005
```
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1
```
91a7d4e7
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 02736082
unknown authored Jun 13, 2005
```
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-4.1


BitKeeper/etc/logging_ok:
  auto-union
```
02736082

func_if.result, func_if.test: · a4535bc8

unknown authored Jun 13, 2005

  Correction for test case of bug #11142.


mysql-test/t/func_if.test:
  Correction for test case of bug #11142.
mysql-test/r/func_if.result:
  Correction for test case of bug #11142.

a4535bc8

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

unknown authored Jun 13, 2005

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


BitKeeper/etc/logging_ok:
  auto-union
sql/ha_innodb.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged

7935311f

func_if.result, func_if.test: · 89906482

unknown authored Jun 13, 2005

  Added a test case for bug #11142.
item_cmpfunc.cc:
  Fixed bug #11142.
  Implementation of Item_func_nullif::is_null was corrected.


sql/item_cmpfunc.cc:
  Fixed bug #11142.
  Implementation of Item_func_nullif::is_null was corrected.
mysql-test/t/func_if.test:
  Added a test case for bug #11142.
mysql-test/r/func_if.result:
  Added a test case for bug #11142.

89906482

logging_ok: · 61962795

unknown authored Jun 13, 2005

  Logging to logging@openlogging.org accepted
DbtcMain.cpp, testTimeout.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout


ndb/test/ndbapi/testTimeout.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

61962795

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 · 1a0bddb8
unknown authored Jun 13, 2005
```
into igor-inspiron.creware.com:/home/igor/mysql-5.0
```
1a0bddb8
Merge igor-inspiron.creware.com:/home/igor/mysql-4.1 · e802cd3b
unknown authored Jun 13, 2005
```
into igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0
```
e802cd3b

ha_innodb.cc: · 95252da4

unknown authored Jun 13, 2005

  Add a patch by Georg Richter to remove compiler warnings on 64-bit Windows


sql/ha_innodb.cc:
  Add a patch by Georg Richter to remove compiler warnings on 64-bit Windows

95252da4

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4fcc3dd8
unknown authored Jun 13, 2005
```
into mysql.com:/home/svoj/devel/yassl-mysql-5.0
```
4fcc3dd8

Merge igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0 · 0cd6d1c6

unknown authored Jun 13, 2005

into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/ctype_utf8.result:
  Auto merged
sql/sql_select.cc:
  Auto merged

0cd6d1c6

Making XID deterministic for rpl_ddl test · 172c03c8

unknown authored Jun 13, 2005


mysql-test/r/rpl_ddl.result:
  Making XID deterministic for test
mysql-test/t/rpl_ddl.test:
  Making XID deterministic for test

172c03c8

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1 · 16fd4ff6

unknown authored Jun 13, 2005

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


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ps_6bdb.result:
  Auto merged
mysql-test/r/ps_7ndb.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_rnext_same.c:
  Auto merged
storage/ndb/include/kernel/AttributeList.hpp:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
storage/ndb/include/util/SimpleProperties.hpp:
  Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  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/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbLinHash.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.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/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

16fd4ff6

5.0->5.1 merge · 0a809431

unknown authored Jun 13, 2005

  remove options2 as it longer needed as serg put SELECT_ALL in bit 24, (removed something)
  making second word not needed


sql/sql_lex.cc:
  remove options2 as it no longer needed
sql/sql_lex.h:
  remove options2 as it no longer needed
sql/sql_yacc.yy:
  remove options2 as it no longer needed

0a809431

ctype_utf8.test, ctype_utf8.result: · 3f483c18

unknown authored Jun 13, 2005

  Added a test case for bug #11167.
sql_select.cc:
  Fixed bug #11167.
  In 4.1 char/varchar fields are limited by 255 characters in
  length that make them longer than 255 bytes in size for such
  character sets as UTF8. The functions store_record_in_cache
  and read_cached_records did not take into account this
  Moreover the code did not take into account that the size
  of the varchar fields in 5.0 can be up to 65535 bytes


sql/sql_select.cc:
  Fixed bug #11167.
  In 4.1 char/varchar fields are limited by 255 characters in
  length that make them longer than 255 bytes in size for such
  character sets as UTF8. The functions store_record_in_cache
  and read_cached_records did not take into account this
  Moreover the code did not take into account that the size
  of the varchar fields in 5.0 can be up to 65535 bytes
mysql-test/r/ctype_utf8.result:
  Added a test case for bug #11167.
mysql-test/t/ctype_utf8.test:
  Added a test case for bug #11167.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

3f483c18

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · b665bfa5
unknown authored Jun 13, 2005
```
into mysql.com:/home/svoj/devel/yassl-mysql-5.0
```
b665bfa5

merge · a52035d1

unknown authored Jun 13, 2005


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/bdb/dist/configure.ac:
  Auto merged
storage/innobase/os/os0file.c:
  Auto merged
storage/innobase/os/os0sync.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/ndb/src/common/logger/Logger.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged

a52035d1

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 · af84e4ae
unknown authored Jun 13, 2005
```
into mysql.com:/home/svoj/devel/yassl-mysql-5.0
```
af84e4ae

Merge mysql.com:/home/jonas/src/wl1882 · fd34694d

unknown authored Jun 13, 2005

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


include/my_sys.h:
  Auto merged
mysys/default.c:
  Auto merged

fd34694d

Merge mysql.com:/home/bk/b6883-mysql-4.1 · ff40f303
unknown authored Jun 13, 2005
```
into mysql.com:/home/bk/mysql-5.0
```
ff40f303

Merge mysql.com:/home/jonas/src/mysql-5.0 · 332792e2

unknown authored Jun 13, 2005

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


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged

332792e2

Merge mysql.com:/home/jonas/src/kk · 2dca4e9f

unknown authored Jun 13, 2005

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


ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/src/cw/cpcd/main.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged

2dca4e9f

Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0 · 50260639
unknown authored Jun 13, 2005
```
BitKeeper/etc/logging_ok:
  auto-union
sql/sql_parse.cc:
  Auto merged
```
50260639
Merge mysql.com:/home/bkroot/mysql-4.1 · 8c4fe301
unknown authored Jun 13, 2005
```
into mysql.com:/home/bk/b6883-mysql-4.1
```
8c4fe301

merge · 828c4633

unknown authored Jun 13, 2005


ndb/src/common/logger/Logger.cpp:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged

828c4633

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 477f1e2f
unknown authored Jun 13, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
477f1e2f
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 · 53a92c87
unknown authored Jun 13, 2005
```
into mysql.com:/home/jonas/src/mysql-4.1-push
```
53a92c87

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

unknown authored Jun 13, 2005

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


ndb/tools/restore/consumer_restore.cpp:
  Auto merged

a2037c67

Merge mysql.com:/home/jonas/src/mysql-4.1 · 861cecf3
unknown authored Jun 13, 2005
```
into mysql.com:/home/jonas/src/mysql-4.1-push
```
861cecf3

bug#10294 - ndb restore with #concurrent transactions < parallelism · 06ab9013

unknown authored Jun 13, 2005

  Enable retry on startTransaction


ndb/tools/restore/consumer_restore.cpp:
  Enable retry on startTransaction==NULL

06ab9013

merge · a02db761

unknown authored Jun 13, 2005


BitKeeper/etc/logging_ok:
  auto-union
libmysqld/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_rnext_same.c:
  Auto merged
storage/ndb/include/kernel/AttributeList.hpp:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
  Auto merged
storage/ndb/include/util/SimpleProperties.hpp:
  Auto merged
storage/ndb/src/common/logger/Logger.cpp:
  Auto merged
storage/ndb/src/common/mgmcommon/IPCConfig.cpp:
  Auto merged
storage/ndb/src/common/transporter/SCI_Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
  Auto merged
storage/ndb/src/cw/cpcd/main.cpp:
  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/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbLinHash.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbif.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndblist.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/run-test/make-config.sh:
  Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.hpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

a02db761

12 Jun, 2005 1 commit

WL#2286 - Compile MySQL w/YASSL support · 3d431536

unknown authored Jun 12, 2005

  Fix for link failures on boxes with non-gnu compiler.


client/Makefile.am:
  Add a dummy C++ file to client suite to make libtool use a C++ linker:
  this lets client suite link when using yaSSL and a non-gcc C++ compiler.
config/ac-macros/yassl.m4:
  HAVE_YASSL conditional is used to add dummy C++ file if configured with yaSSL.
tests/Makefile.am:
  Add a dummy C++ file to tests to make libtool use a C++ linker:
  this lets tests link when using yaSSL and a non-gcc C++ compiler.
vio/Makefile.am:
  Use dummy C++ file if configured with yaSSL only.

3d431536

11 Jun, 2005 2 commits

Merge · b85705cc

unknown authored Jun 11, 2005


mysql-test/Makefile.am:
  Auto merged
extra/yassl/taocrypt/include/modes.hpp:
  SCCS merged

b85705cc

Merge mysql.com:/home/jimw/my/mysql-4.1-clean · 871977f2

unknown authored Jun 10, 2005

into  mysql.com:/home/jimw/my/mysql-5.0-clean


client/mysql.cc:
  Auto merged
mysql-test/r/lowercase_table2.result:
  Auto merged
sql/mysqld.cc:
  Auto merged

871977f2

10 Jun, 2005 4 commits
- Merge jwinstead@production.mysql.com:my/mysql-4.1-10840 · da4838a0
  unknown authored Jun 10, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
  da4838a0
- Merge mdk10.(none):/home/reggie/bk/mysql-4.1-base · 9b7f8f70
  unknown authored Jun 10, 2005
```
into mdk10.(none):/home/reggie/bk/mysql-5.0-base


myisam/mi_open.c:
  Auto merged
```
  9b7f8f70
- Merge mysql.com:/home/jimw/my/mysql-4.1-9500 · 0670a02c
  unknown authored Jun 10, 2005
```
into  mysql.com:/home/jimw/my/mysql-4.1-clean
```
  0670a02c
- Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0 · d02e86de
  unknown authored Jun 10, 2005
```
into mdk10.(none):/home/reggie/bk/50test2
```
  d02e86de