Commits · a7e1295677b923bab743273e1824f6ff801f1c3a · nexedi / MariaDB

09 May, 2005 1 commit
- After review fixes · a7e12956
  unknown authored May 09, 2005
  
  a7e12956
07 May, 2005 1 commit

unknown authored May 07, 2005


sql/ha_ndbcluster.cc:
  Import patch wl2445.patch
sql/handler.h:
  Import patch wl2445.patch
sql/sql_delete.cc:
  Import patch wl2445.patch
sql/sql_update.cc:
  Import patch wl2445.patch

a6feabdb

04 May, 2005 9 commits

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

unknown authored May 04, 2005

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


storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SuperPool.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SuperPool.hpp:
  Auto merged
storage/ndb/src/kernel/vm/testSuperPool.cpp:
  Auto merged

25f1f102

testSuperPool.cpp: · 9603ee2c

unknown authored May 04, 2005

Rename: ndb/src/kernel/vm/testSuperPool.cpp -> storage/ndb/src/kernel/vm/testSuperPool.cpp
SuperPool.hpp:
Rename: ndb/src/kernel/vm/SuperPool.hpp -> storage/ndb/src/kernel/vm/SuperPool.hpp
SuperPool.cpp:
Rename: ndb/src/kernel/vm/SuperPool.cpp -> storage/ndb/src/kernel/vm/SuperPool.cpp
DbtupScan.cpp:
Rename: ndb/src/kernel/blocks/dbtup/DbtupScan.cpp -> storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp

storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Rename: ndb/src/kernel/blocks/dbtup/DbtupScan.cpp -> storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
storage/ndb/src/kernel/vm/SuperPool.cpp:
Rename: ndb/src/kernel/vm/SuperPool.cpp -> storage/ndb/src/kernel/vm/SuperPool.cpp
storage/ndb/src/kernel/vm/SuperPool.hpp:
Rename: ndb/src/kernel/vm/SuperPool.hpp -> storage/ndb/src/kernel/vm/SuperPool.hpp
storage/ndb/src/kernel/vm/testSuperPool.cpp:
Rename: ndb/src/kernel/vm/testSuperPool.cpp -> storage/ndb/src/kernel/vm/testSuperPool.cpp

9603ee2c

ndb - storage/ fix · 9a0b7380

unknown authored May 04, 2005

storage/ndb/src/kernel/vm/SuperPool.cpp:
Rename: ndb/src/kernel/vm/SuperPool.cpp -> storage/ndb/src/kernel/vm/SuperPool.cpp
storage/ndb/src/kernel/vm/SuperPool.hpp:
Rename: ndb/src/kernel/vm/SuperPool.hpp -> storage/ndb/src/kernel/vm/SuperPool.hpp
storage/ndb/src/kernel/vm/testSuperPool.cpp:
Rename: ndb/src/kernel/vm/testSuperPool.cpp -> storage/ndb/src/kernel/vm/testSuperPool.cpp
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
Rename: ndb/src/kernel/blocks/dbtup/DbtupScan.cpp -> storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp

9a0b7380

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

unknown authored May 04, 2005

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


sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/ndb/src/common/portlib/gcc.cpp:
  Auto merged
storage/ndb/src/common/util/new.cpp:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

63bc33ad

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 · 2a5b1316
unknown authored May 04, 2005
```
into mysql.com:/home/jonas/src/mysql-5.0
```
2a5b1316

bug#10330 - linking with ndb fails · 325fe549

unknown authored May 04, 2005

  changes to handling of new/delete cxa_pure_virtual has changed in mysys
  remove "ndb"'s own impl. as they are no longer needed as we link mysys at all places


ndb/src/common/portlib/gcc.cpp:
  remove ndb __cxa_pure_virtual
ndb/src/common/util/new.cpp:
  remove "ndb" new/delete

325fe549

Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 0ba34998
unknown authored May 04, 2005
```
into mysql.com:/space/my/mysql-5.0
```
0ba34998
Merge mysql.com:/space/my/mysql-4.1-build · 00a9d779
unknown authored May 04, 2005
```
into mysql.com:/space/my/mysql-5.0-build
```
00a9d779
- added missing el_term.h to the source distribution (BUG#10352) · d64f8b3d
unknown authored May 04, 2005

d64f8b3d

03 May, 2005 5 commits

Merge book.sanja.is.com.ua:/Users/bell/mysql/bk/mysql-5.0 · 9ebb54e9

unknown authored May 03, 2005

into book.sanja.is.com.ua:/Users/bell/mysql/bk/work-test-5.0


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

9ebb54e9

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 73718d40
unknown authored May 03, 2005
```
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean


sql/ha_innodb.cc:
  Auto merged
```
73718d40
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · e4ecb68d
unknown authored May 03, 2005
```
into mysql.com:/home/psergey/mysql-5.0-test-valgrind
```
e4ecb68d
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 · f5955f4d
unknown authored May 03, 2005
```
into mysql.com:/home/psergey/mysql-5.0-test-valgrind


sql/sql_select.cc:
  Auto merged
```
f5955f4d

ha_innodb.cc: · e3d2bb40

unknown authored May 03, 2005

  Return a value from innobase_repl_report_sent_binlog()


sql/ha_innodb.cc:
  Return a value from innobase_repl_report_sent_binlog()

e3d2bb40

02 May, 2005 14 commits

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

unknown authored May 03, 2005

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean


configure.in:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
scripts/mysql_create_system_tables.sh:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

66d73883

Update test results · 4471eb92

unknown authored May 02, 2005


mysql-test/r/query_cache.result:
  Update results
mysql-test/r/user_limits.result:
  Update results

4471eb92

Resolve merge of fix for #8166. · d56287da

unknown authored May 02, 2005


mysql-test/r/system_mysql_db.result:
  Update results
scripts/mysql_create_system_tables.sh:
  Resolve merge of bug fix
scripts/mysql_fix_privilege_tables.sql:
  Resolve merge of bug fix

d56287da

Merge mysql.com:/home/jimw/my/mysql-5.0-7293 · fe2a6ef9
unknown authored May 02, 2005
```
into mysql.com:/home/jimw/my/mysql-5.0-clean
```
fe2a6ef9

Merge mysql.com:/home/jimw/my/mysql-5.0-5354 · cf590487

unknown authored May 02, 2005

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


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

cf590487

Clean up merge from 4.1 · 96585484

unknown authored May 02, 2005


configure.in:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/lowercase_table.result:
  Auto merged
mysql-test/r/query_cache.result:
  Mege results
mysql-test/t/lowercase_table.test:
  Merge tests
mysql-test/t/query_cache.test:
  Merge tests
mysys/default.c:
  Merge from 4.1
sql/sql_cache.cc:
  Merge
sql/sql_parse.cc:
  Merge from 4.1
sql/sql_table.cc:
  Merge
tests/mysql_client_test.c:
  Merge

96585484

Merge bk-internal:/home/bk/mysql-5.0 · 4fce15c5
unknown authored May 02, 2005
```
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_blackhole.cc:
  Auto merged
```
4fce15c5
Merge mysql.com:/home/jimw/my/mysql-4.1-9947 · 8d1e7d1f
unknown authored May 02, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean
```
8d1e7d1f
Merge mysql.com:/home/jimw/my/mysql-4.1-9761 · ae44db7b
unknown authored May 02, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean
```
ae44db7b
Merge mysql.com:/home/jimw/my/mysql-4.1-9136 · 86dcf352
unknown authored May 02, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean


mysys/default.c:
  Auto merged
```
86dcf352
Merge bk-internal:/home/bk/mysql-4.1 · 545e4a29
unknown authored May 02, 2005
```
into mysql.com:/home/jimw/my/mysql-4.1-clean


configure.in:
  Auto merged
```
545e4a29

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 7d7235bc

unknown authored May 02, 2005

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
storage/ndb/include/debugger/SignalLoggerManager.hpp:
  Auto merged
storage/ndb/include/kernel/ndb_limits.h:
  Auto merged
storage/ndb/include/kernel/signaldata/AccScan.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/NextScan.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ScanFrag.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/ScanTab.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcCommit.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/common/debugger/SignalLoggerManager.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccInit.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/dbdict/SchemaFile.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  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/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Makefile.am:
  Auto merged
storage/ndb/src/kernel/vm/Makefile.am:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/include/HugoTransactions.hpp:
  Auto merged
storage/ndb/test/ndbapi/testDict.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
storage/ndb/test/ndbapi/testScan.cpp:
  Auto merged
storage/ndb/test/ndbapi/testScanPerf.cpp:
  Auto merged
storage/ndb/test/run-test/daily-devel-tests.txt:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/test/src/HugoTransactions.cpp:
  Auto merged

7d7235bc

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

unknown authored May 02, 2005

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-clean


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
storage/heap/hp_hash.c:
  Auto merged
storage/innobase/dict/dict0dict.c:
  Auto merged
storage/innobase/fil/fil0fil.c:
  Auto merged
storage/innobase/include/dict0dict.h:
  Auto merged
storage/myisam/Makefile.am:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/myisammrg/myrg_open.c:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

00ad6116

Fix typo in ha_backhole.cc · 945368e5
unknown authored May 02, 2005
```
sql/ha_blackhole.cc:
  Fix typo
```
945368e5

01 May, 2005 3 commits

Merge bk-internal:/home/bk/mysql-5.0 · 07357b93

unknown authored May 01, 2005

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


Makefile.am:
  Auto merged
client/mysqladmin.cc:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

07357b93

Merge mysql.com:/home/psergey/mysql-4.1-bug9228 · 186e5cd2
unknown authored May 01, 2005
```
into mysql.com:/home/psergey/mysql-5.0-bug10274-merge


sql/protocol.cc:
  Auto merged
```
186e5cd2
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 · 30d769c2
unknown authored May 01, 2005
```
into mysql.com:/home/psergey/mysql-4.1-bug9228
```
30d769c2

30 Apr, 2005 7 commits

yassl changeset 2: · 07918c8c

unknown authored Apr 30, 2005

  remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL
  replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR
  don't set -DUSE_MYSYS_NEW for gcc 2.95
  set $USE_MYSYS_NEW even if CXX is g++
  yassl bugfixes
  instantiate all yassl templates explicitly


client/Makefile.am:
  mysqlbinlog as a c++ program may need my_new.cc (if CXX=gcc)
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
client/mysqladmin.cc:
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
client/mysqlbinlog.cc:
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
configure.in:
  echo should be AC_MSG_WARN or AC_MSG_ERROR
  don't set -DUSE_MYSYS_NEW for gcc 2.95 (to restore old behaviour)
  set $USE_MYSYS_NEW even if CXX is g++ (for yassl, as it can be linked with C programs)
  remove -DDEFINE_CXA_PURE_VIRTUAL - -DUSE_MYSYS_NEW is enough
extra/yassl/mySTL/list.hpp:
  bugfixes
extra/yassl/src/Makefile.am:
  no need to mess with CXXFLAGS anymore. Instantiate all templates explicitly
extra/yassl/src/crypto_wrapper.cpp:
  instantiate templates explicitly
extra/yassl/src/yassl_imp.cpp:
  instantiate templates explicitly
extra/yassl/src/yassl_int.cpp:
  instantiate templates explicitly
extra/yassl/taocrypt/include/runtime.hpp:
  use -DUSE_MYSYS_NEW not -DDEFINE_CXA_PURE_VIRTUAL
  assert in __cxa_pure_virtual
  remove dummy (and thus dangerous) __cxa_guard_acquire/__cxa_guard_release
extra/yassl/taocrypt/src/Makefile.am:
  no need to mess with CXXFLAGS anymore. Instantiate all templates explicitly
extra/yassl/taocrypt/src/integer.cpp:
  instantiate templates explicitly
extra/yassl/taocrypt/src/rsa.cpp:
  instantiate templates explicitly
include/my_global.h:
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
mysys/my_new.cc:
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
server-tools/instance-manager/command.cc:
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
sql/ha_blackhole.cc:
  typo fixed
sql/ha_innodb.cc:
  warning fixed
sql/item_func.cc:
  use LL()
sql/mysqld.cc:
  no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc

07918c8c

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · e5a05ffe
unknown authored Apr 30, 2005
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-test-5.0


sql/item.h:
  Auto merged
```
e5a05ffe

postreview changes · d617da7c

unknown authored Apr 30, 2005


sql/item.cc:
  changed parameters order
sql/item.h:
  changed parameters order
sql/sql_base.cc:
  fixed comment
  changed parameters order

d617da7c

After merge fixes · 8d06dc45

unknown authored Apr 30, 2005


Makefile.am:
  Added target test-force
mysql-test/r/cast.result:
  Updated results after merge

8d06dc45

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 · b94d7b5a
unknown authored Apr 30, 2005
```
into sanja.is.com.ua:/home/bell/mysql/bk/work-test-5.0
```
b94d7b5a

Merge with 4.1 · 37613385

unknown authored Apr 30, 2005


BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/drop.result:
  Auto merged
mysys/default.c:
  Auto merged
mysys/mf_keycache.c:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Auto merged
mysql-test/r/cast.result:
  Merge
mysql-test/t/cast.test:
  Merge
sql/sql_insert.cc:
  Merge
sql/sql_select.cc:
  Merge

37613385

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · b6b13d73
unknown authored Apr 30, 2005
```
into mysql.com:/home/my/mysql-5.0


tests/mysql_client_test.c:
  Auto merged
```
b6b13d73