mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36495 commits 2788 branches 343 tags 1.7 GiB
Commit graph

3276 commits

Author SHA1 Message Date
unknown
7d3bf44e61 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
 2006-12-01 14:05:41 +01:00
unknown
f8c691172a ndb - bug#24752 
This prevent any subsequent node restarts, but it's better than crashing an alive node


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix for bug#24752
  This prevent any subsequent node restarts, but it's better than crashing an alive node
 2006-12-01 13:57:29 +01:00
unknown
8e56426c0a Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
 2006-12-01 11:35:12 +01:00
unknown
a29f527635 ndb - bug#24748 
Skip rollback if only committedRead in transaction


ndb/src/ndbapi/NdbTransaction.cpp:
  Skip rollback if only committedRead in transaction
 2006-12-01 11:24:37 +01:00
unknown
61c5b80e9f ndb - 
add testcase for bug#24717
 + fix typo


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Add new error insert 9002
    which is 9000, but will auto enable when started
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  Add new error insert 9002
    which is 9000, but will auto enable when started
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Fix typo
ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase for bug#24717
ndb/test/run-test/daily-basic-tests.txt:
  add testcase for bug#24717
 2006-12-01 10:25:11 +01:00
unknown
cc00d542ac ndb - bug#24717 
5.0 version
  Add some extra state to try to prevent sending committedread to node too early


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  remove extra virtual-indirection
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  remove extra virtual-indirection
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  remove extra virtual-indirection
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Add retry mechanism to send TCKEYREF
    (as extra safety)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Add retry mechanism to send TCKEYREF
    (as extra safety)
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Add extra state to prevent sending committed reads to node to early
    (before connection establishment)
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Add extra state to prevent sending committed reads to node to early
    (before connection establishment)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Add extra state to prevent sending committed reads to node to early
    (before connection establishment)
ndb/src/kernel/vm/SimulatedBlock.cpp:
  remove extra virtual-indirection
ndb/src/kernel/vm/SimulatedBlock.hpp:
  remove extra virtual-indirection
 2006-12-01 09:06:01 +01:00
unknown
8e0f8a62e4 Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj 
into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb


ndb/src/mgmsrv/Services.cpp:
  Auto merged
 2006-12-01 11:13:43 +08:00
unknown
25226de9ea Fixed compiler warnings 
Don't assert if my_thread_end() is called twice (common case)


client/mysql.cc:
  Removed not used variables
client/mysqldump.c:
  Fixed compiler warnings
client/mysqltest.c:
  Fixed compiler warnings
cmd-line-utils/readline/bind.c:
  Fixed compiler warnings
cmd-line-utils/readline/histfile.c:
  Fixed compiler warnings
extra/replace.c:
  Fixed compiler warning on windows
extra/yassl/taocrypt/include/algebra.hpp:
  Fixed compiler warnings
heap/hp_write.c:
  Fixed compiler warnings
innobase/os/os0file.c:
  Fixed compiler warnings
libmysql/libmysql.c:
  Call my_end()/my_thread_end last.
  my_end() calls free_charsets(), which allowed me to move the call
myisam/myisampack.c:
  Fixed compiler warnings
myisammrg/myrg_rkey.c:
  Fixed compiler warnings
mysys/my_thr_init.c:
  More comments
  Don't assert if my_thread_end() is called twice (common case)
ndb/src/mgmapi/mgmapi.cpp:
  Fixed compiler warnings
ndb/src/ndbapi/Ndb.cpp:
  Fixed compiler warnings
ndb/src/ndbapi/NdbScanOperation.cpp:
  Fixed compiler warnings
ndb/src/ndbapi/NdbTransaction.cpp:
  Fixed compiler warnings
ndb/src/ndbapi/Ndblist.cpp:
  Fixed compiler warnings
server-tools/instance-manager/guardian.cc:
  Removed not used variable
server-tools/instance-manager/portability.h:
  Removed duplicated symbol
sql/gen_lex_hash.cc:
  Fixed compiler warning
sql/ha_archive.cc:
  Fixed compiler warnings
sql/ha_ndbcluster.cc:
  Fixed compiler warnings
sql/mysqld.cc:
  Fixed compiler warnings
sql/sql_cache.cc:
  Fixed compiler warnings
  Fixed DBUG_PRINT strings to be consistent with 5.1
sql/tztime.cc:
  Fixed compiler warnings
sql/uniques.cc:
  Fixed compiler warnings
 2006-11-30 21:56:03 +02:00
unknown
7d3cb1a453 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
 2006-11-30 16:04:12 +01:00
unknown
fa5b6774d0 BUG#21033 The error log of mysqld shows useless information, and hides the real error. 
ndb/src/ndbapi/Ndb.cpp:
  Ndb.closeTransaction() modifies the value of Ndb.theError.code,
      but the error code shouldn't be changed here.
      Mysqld will use the returning error code to log the correct error information.
 2006-11-29 16:45:18 +08:00
unknown
048dfce072 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/kent/bk/mysql-5.0-merge


sql-common/my_time.c:
  Auto merged
 2006-11-27 21:45:16 +01:00
unknown
16918343a8 ha_innodb.m4, Makefile.am, ha_ndbcluster.m4, Makefile.shared, ha_berkeley.m4: 
Reenabled build outside source tree


config/ac-macros/ha_berkeley.m4:
  Reenabled build outside source tree
config/ac-macros/ha_innodb.m4:
  Reenabled build outside source tree
config/ac-macros/ha_ndbcluster.m4:
  Reenabled build outside source tree
extra/yassl/src/Makefile.am:
  Reenabled build outside source tree
extra/yassl/taocrypt/benchmark/Makefile.am:
  Reenabled build outside source tree
extra/yassl/taocrypt/src/Makefile.am:
  Reenabled build outside source tree
extra/yassl/taocrypt/test/Makefile.am:
  Reenabled build outside source tree
extra/yassl/testsuite/Makefile.am:
  Reenabled build outside source tree
libmysql/Makefile.shared:
  Reenabled build outside source tree
ndb/src/mgmsrv/Makefile.am:
  Reenabled build outside source tree
 2006-11-27 21:15:25 +01:00
unknown
14ba2178ed Merge mysql.com:/home/kent/bk/mysql-4.1 
into  mysql.com:/home/kent/bk/mysql-5.0


BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
bdb/dist/gen_rec.awk:
  Auto merged
libmysql_r/Makefile.am:
  Auto merged
ndb/config/type_ndbapitools.mk.am:
  Auto merged
ndb/src/kernel/Makefile.am:
  Auto merged
 2006-11-27 18:47:07 +01:00
unknown
8d6f67f326 gen_rec.awk: 
Fix undefined behaviour.
Many files:
  Reenabled build outside ource tree


bdb/dist/gen_rec.awk:
  Fix undefined behaviour.
acinclude.m4:
  Reenabled build outside ource tree
configure.in:
  Reenabled build outside ource tree
libmysql_r/Makefile.am:
  Reenabled build outside ource tree
libmysqld/Makefile.am:
  Reenabled build outside ource tree
ndb/config/common.mk.am:
  Reenabled build outside ource tree
ndb/config/type_kernel.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapi.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitest.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitools.mk.am:
  Reenabled build outside ource tree
ndb/config/type_util.mk.am:
  Reenabled build outside ource tree
ndb/src/kernel/Makefile.am:
  Reenabled build outside ource tree
 2006-11-27 18:29:50 +01:00
unknown
9c7361e645 ndb - bug#24503 
remove debug printouts


ndb/src/common/util/NdbSqlUtil.cpp:
  remove debug printouts
 2006-11-22 15:45:57 +01:00
unknown
1ca32bbc29 ndb - bug#24503 
Fix scan filter on bit types
  (note should probably be enabled in condition pushdown aswell)


ndb/src/common/util/NdbSqlUtil.cpp:
  Add support for comparing bit types
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add new error code
ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Add new error code
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Add correct handling of unsupported type
ndb/src/ndbapi/ndberror.c:
  Add new error code
 2006-11-22 15:42:03 +01:00
unknown
bb4c84e69e Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
 2006-11-22 14:14:36 +01:00
unknown
55640f608d ndb - bug#24461 
m  ove mlock to much earlier in startphases
  not to affect heartbeats


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  move mlock to much earlier in startphases
    not to affect heartbeats
 2006-11-22 14:13:32 +01:00
unknown
acd362950f Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
 2006-11-22 14:09:02 +01:00
unknown
9e9f5fc2ce ndb - bug#24461 - LockPagesInMemory ignored 
actually do run mlockall


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  actually do run mlockall
 2006-11-22 14:05:40 +01:00
unknown
9759d3c9df Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testScan.cpp:
  merge
ndb/test/run-test/daily-basic-tests.txt:
  merge
 2006-11-21 14:14:43 +01:00
unknown
c893cb4ffb ndb - 
update error code list
  (for bug#24447)


ndb/src/kernel/blocks/ERROR_codes.txt:
  ndb -
    update error code list
 2006-11-21 14:06:20 +01:00
unknown
99d3926318 ndb - bug#24447 
api disconnect just after SCAN_TABREQ


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) add error insert for faking DISCONNECT of API just after SCAN_TABREQ
  2) handle error :-)
ndb/test/ndbapi/testScan.cpp:
  Add etstcase for bug 24447
ndb/test/run-test/daily-basic-tests.txt:
  Add etstcase for bug 24447
 2006-11-21 14:04:20 +01:00
unknown
1d4c0199b2 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/common/util/socket_io.cpp:
  Auto merged
ndb/src/common/util/InputStream.cpp:
  merge
 2006-11-21 12:01:44 +01:00
unknown
0179789241 ndb - 
Fix bug wrt to '\r' handling in latest commit to bug#24011


ndb/src/common/util/InputStream.cpp:
  Fix bug wrt to '\r' handling in latest commit to bug#24011
ndb/src/common/util/socket_io.cpp:
  Fix bug wrt to '\r' handling in latest commit to bug#24011
 2006-11-21 11:57:41 +01:00
unknown
14decc4fbc Remove compiler warnings 
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)


BitKeeper/etc/ignore:
  added mysql-test/r/*.warnings
BUILD/SETUP.sh:
  Don't build with BDB as default
client/client_priv.h:
  Added OPT_DEBUG_INFO
client/mysqlbinlog.cc:
  Fixed compiler warning
client/mysqldump.c:
  Removed compiler warnings
  Added option --debug-info to detect memory leaks
  Fixed memory leak
  Don't backup cluster replication tables (if used with 5.1)
cmd-line-utils/readline/bind.c:
  Fixed compiler warning
cmd-line-utils/readline/chardefs.h:
  Fixed compiler warning
cmd-line-utils/readline/complete.c:
  Fixed compiler warning
cmd-line-utils/readline/display.c:
  Fixed compiler warning
cmd-line-utils/readline/histexpand.c:
  Fixed compiler warning
cmd-line-utils/readline/input.c:
  Fixed compiler warning
cmd-line-utils/readline/isearch.c:
  Fixed compiler warning
cmd-line-utils/readline/kill.c:
  Fixed compiler warning
cmd-line-utils/readline/macro.c:
  Fixed compiler warning
cmd-line-utils/readline/misc.c:
  Fixed compiler warning
cmd-line-utils/readline/nls.c:
  Fixed compiler warning
cmd-line-utils/readline/readline.c:
  Fixed compiler warning
cmd-line-utils/readline/rltty.c:
  Fixed compiler warning
cmd-line-utils/readline/search.c:
  Fixed compiler warning
cmd-line-utils/readline/terminal.c:
  Fixed compiler warning
cmd-line-utils/readline/text.c:
  Fixed compiler warning
cmd-line-utils/readline/tilde.c:
  Fixed compiler warning
cmd-line-utils/readline/undo.c:
  Fixed compiler warning
cmd-line-utils/readline/util.c:
  Fixed compiler warning
cmd-line-utils/readline/vi_mode.c:
  Fixed compiler warning
dbug/dbug_analyze.c:
  Fixed compiler warning
extra/yassl/src/ssl.cpp:
  Fixed compiler warning
extra/yassl/testsuite/testsuite.cpp:
  Fixed compiler warning
heap/_check.c:
  Fixed compiler warning
heap/hp_delete.c:
  Fixed compiler warning
heap/hp_hash.c:
  Fixed compiler warning
heap/hp_open.c:
  Fixed compiler warning
heap/hp_rkey.c:
  Fixed compiler warning
heap/hp_rrnd.c:
  Fixed compiler warning
heap/hp_write.c:
  Fixed compiler warning
libmysql/libmysql.c:
  Fixed compiler warning
libmysqld/libmysqld.c:
  Fixed compiler warning
myisam/mi_close.c:
  Fixed compiler warning
myisam/mi_delete.c:
  Fixed compiler warning
myisam/mi_dynrec.c:
  Fixed compiler warning
myisam/mi_keycache.c:
  Fixed compiler warning
myisam/mi_page.c:
  Fixed compiler warning
myisam/mi_statrec.c:
  Fixed compiler warning
myisam/mi_test2.c:
  Fixed compiler warning
myisam/mi_write.c:
  Fixed compiler warning
myisam/myisampack.c:
  Fixed compiler warning
myisammrg/myrg_extra.c:
  Fixed compiler warning
mysql-test/mysql-test-run.pl:
  Remove .reject, .progress, .log and .warnings flag at start
  cluster -> mysql database (for 5.1)
mysql-test/include/federated.inc:
  Remove mysqltest warnings
mysql-test/include/sp-vars.inc:
  Remove mysqltest warnings
mysql-test/mysql-test-run.sh:
  Fix so that 'make test' works again
  Remove .reject, .progress .log and .warnings files at startup
mysql-test/r/ctype_cp1250_ch.result:
  Drop used tables at startup
mysql-test/t/create.test:
  Remove mysqltest warnings
mysql-test/t/csv.test:
  Remove mysqltest warnings
mysql-test/t/ctype_collate.test:
  Remove mysqltest warnings
mysql-test/t/ctype_cp1250_ch.test:
  Drop used tables at startup
mysql-test/t/ctype_ucs.test:
  Remove mysqltest warnings
mysql-test/t/func_sapdb.test:
  Remove mysqltest warnings
mysql-test/t/func_str.test:
  Remove mysqltest warnings
mysql-test/t/grant.test:
  Remove mysqltest warnings
mysql-test/t/greedy_optimizer.test:
  Remove mysqltest warnings
mysql-test/t/group_min_max.test:
  Remove mysqltest warnings
mysql-test/t/innodb.test:
  Remove mysqltest warnings
mysql-test/t/join.test:
  Remove mysqltest warnings
mysql-test/t/limit.test:
  Remove mysqltest warnings
mysql-test/t/null.test:
  Remove mysqltest warnings
mysql-test/t/select.test:
  Remove mysqltest warnings
mysql-test/t/sp-prelocking.test:
  Remove mysqltest warnings
mysql-test/t/strict.test:
  Remove mysqltest warnings
mysql-test/t/subselect.test:
  Remove mysqltest warnings
mysql-test/t/type_newdecimal.test:
  Remove mysqltest warnings
mysql-test/t/view_grant.test:
  Remove mysqltest warnings
mysys/default.c:
  Fixed compiler warning
mysys/hash.c:
  Fixed compiler warning
mysys/list.c:
  Fixed compiler warning
mysys/mf_iocache.c:
  Fixed compiler warning
mysys/mf_keycache.c:
  Fixed compiler warning
mysys/mf_keycaches.c:
  Fixed compiler warning
mysys/my_alloc.c:
  Fixed compiler warning
mysys/my_dup.c:
  Fixed compiler warning
mysys/my_fopen.c:
  Fixed compiler warning
mysys/my_fstream.c:
  Fixed compiler warning
mysys/my_getwd.c:
  Fixed compiler warning
mysys/my_handler.c:
  Fixed compiler warning
  Added missing enums in switch
mysys/my_lib.c:
  Fixed compiler warning
mysys/my_lread.c:
  Fixed compiler warning
mysys/my_lwrite.c:
  Fixed compiler warning
mysys/my_malloc.c:
  Fixed compiler warning
mysys/my_pread.c:
  Fixed compiler warning
mysys/my_read.c:
  Fixed compiler warning
mysys/my_realloc.c:
  Fixed compiler warning
mysys/my_seek.c:
  Fixed compiler warning
mysys/my_write.c:
  Fixed compiler warning
mysys/safemalloc.c:
  Fixed compiler warning
mysys/thr_lock.c:
  Fixed compiler warning
mysys/tree.c:
  Fixed compiler warning
mysys/typelib.c:
  Fixed compiler warning
ndb/include/logger/LogHandler.hpp:
  Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings)
ndb/include/ndb_global.h.in:
  Added LINT_SET_PTR macro to be able to remove some compiler warnings
ndb/include/util/InputStream.hpp:
  Fixed compiler warning
ndb/include/util/OutputStream.hpp:
  Fixed compiler warning
ndb/include/util/SimpleProperties.hpp:
  Fixed compiler warning
ndb/src/common/debugger/EventLogger.cpp:
  remove if on 'signal' as this is a function pointer and is always true
ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Add missing enums
ndb/src/common/logger/LogHandler.cpp:
  Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings)
ndb/src/common/portlib/NdbMutex.c:
  Fixed compiler warning
ndb/src/common/portlib/NdbThread.c:
  Fixed compiler warning
ndb/src/common/transporter/Transporter.cpp:
  Swapped arguments to remove compiler warnings
ndb/src/cw/cpcd/CPCD.hpp:
  Fixed compiler warning
ndb/src/kernel/blocks/backup/Backup.cpp:
  Fixed compiler warning
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Fixed compiler warning
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fixed compiler warning
ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp:
  Fixed compiler warning
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Added missing enums
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Fixed compiler warning
ndb/src/kernel/error/ErrorReporter.cpp:
  Fixed compiler warning
ndb/src/kernel/error/ErrorReporter.hpp:
  Fixed compiler warning
ndb/src/kernel/error/ndbd_exit_codes.c:
  Fixed compiler warning
ndb/src/kernel/vm/TransporterCallback.cpp:
  Fixed compiler warning
ndb/src/mgmapi/mgmapi.cpp:
  Fixed compiler warning
ndb/src/mgmclient/CommandInterpreter.cpp:
  Fixed compiler warning
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Fixed compiler warning
ndb/src/mgmsrv/Services.cpp:
  Fixed compiler warning
ndb/src/ndbapi/ClusterMgr.cpp:
  Fixed compiler warning
ndb/src/ndbapi/DictCache.cpp:
  Fixed compiler warning
ndb/src/ndbapi/Ndb.cpp:
  Fixed compiler warning
ndb/src/ndbapi/NdbOperationDefine.cpp:
  Fixed compiler warning
ndb/src/ndbapi/NdbOperationExec.cpp:
  Fixed compiler warning
ndb/src/ndbapi/NdbOperationInt.cpp:
  Fixed compiler warning
ndb/src/ndbapi/NdbOperationSearch.cpp:
  Fixed compiler warning
ndb/src/ndbapi/NdbTransaction.cpp:
  Fixed compiler warning
ndb/src/ndbapi/Ndbif.cpp:
  Fixed compiler warning
ndb/src/ndbapi/Ndbinit.cpp:
  Fixed compiler warning
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Fixed compiler warning
ndb/tools/drop_index.cpp:
  Fixed compiler warning
ndb/tools/drop_tab.cpp:
  Fixed compiler warning
ndb/tools/ndb_config.cpp:
  Fixed compiler warning
regex/regexec.c:
  Fixed compiler warning
server-tools/instance-manager/mysql_connection.cc:
  Fixed compiler warning
sql/Makefile.am:
  Fix for bison 1.875, which adds an attribute statement that gcc 4.1.0 can't parse
sql/filesort.cc:
  Fixed compiler warning
sql/ha_archive.cc:
  Fixed compiler warning
sql/ha_federated.cc:
  Fixed compiler warning
sql/ha_federated.h:
  Fixed compiler warning
sql/ha_innodb.cc:
  Fixed compiler warning
sql/ha_myisam.cc:
  Fixed compiler warning
sql/ha_myisammrg.cc:
  Fixed compiler warning
sql/ha_ndbcluster.cc:
  Fixed compiler warning
sql/handler.cc:
  Fixed compiler warning
sql/item_cmpfunc.cc:
  Fixed compiler warning
sql/item_subselect.cc:
  Fixed compiler warning
sql/item_timefunc.cc:
  Fixed compiler warning
sql/log_event.cc:
  Fixed compiler warning
sql/mysqld.cc:
  Fixed compiler warning
sql/net_serv.cc:
  Fixed compiler warning
sql/opt_range.cc:
  Fixed compiler warning
  Formated DBUG statements to be as rest of code
sql/slave.cc:
  Fixed compiler warning
sql/sql_acl.cc:
  Fixed compiler warning
sql/sql_cache.cc:
  Fixed compiler warning
  Fixed bug in query cache when used with DBUG traceing
sql/sql_class.cc:
  Fixed compiler warning
sql/sql_class.h:
  Fixed compiler warning
sql/sql_delete.cc:
  Fixed compiler warning
sql/sql_parse.cc:
  Fixed compiler warning
  Hack to fix my_sprintf() strings with %b
sql/sql_prepare.cc:
  Fixed compiler warning
  Hack to fix my_sprintf() strings with %b
sql/sql_repl.cc:
  Fixed compiler warning
sql/sql_select.cc:
  Fixed compiler warning
sql/sql_update.cc:
  Fixed compiler warning
sql/sql_view.cc:
  Fixed compiler warning
sql/strfunc.cc:
  Fixed compiler warning
sql-common/client.c:
  Fixed compiler warning
sql-common/my_time.c:
  Fixed compiler warning
sql/table.cc:
  Fixed compiler warning
sql/tztime.cc:
  Fixed compiler warning
sql/unireg.cc:
  Fixed compiler warning
strings/decimal.c:
  Fixed compiler warning
tests/mysql_client_test.c:
  Fixed compiler warning
vio/viosocket.c:
  Fixed compiler warning
vio/viossl.c:
  Fixed compiler warning
vio/viosslfactories.c:
  Fixed compiler warning
 2006-11-20 22:42:06 +02:00
unknown
c34c48673b Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb 
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-misc
 2006-11-16 21:13:10 +01:00
unknown
259532e26e Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
 2006-11-14 11:38:57 +01:00
unknown
6dc05dde2b Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
 2006-11-14 10:06:11 +01:00
unknown
2418ff1028 Fix for Bug #23887 (Introduced by Bugfix #22295) 
ndb/tools/ndb_config.cpp:
  use standard option variable with standard option
 2006-11-13 17:04:40 +01:00
unknown
6f65b2c0cc Fix bug#24023: Let "ndb/src/common/portlib/gcc.cpp" export a dummy symbol. 
ndb/src/common/portlib/gcc.cpp:
  Fix bug#24023:  Make sure this module always exports some symbol, whether used anywhere or not.
 2006-11-07 16:01:54 +01:00
unknown
f62a53f2f8 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-11-06 14:54:03 +01:00
unknown
1ef8fe5a16 ndb - bug#24011 
ndb/src/common/util/socket_io.cpp:
  Fix problem with cut sockmessages
 2006-11-06 14:50:45 +01:00
unknown
45cbd3c187 BUG#22299 mgmd crash due to unchecked TransporterFacade::ThreadData expand() 
abort if we ever fail to expand a Vector


ndb/include/util/Vector.hpp:
  abort on failure to allocate memory
 2006-11-03 23:56:25 +11:00
unknown
1b3bcced4e ndb - fix test case: testDict -n Restart_NR* T1 I3 
ndb/test/ndbapi/testDict.cpp:
  fix testDict -n Restart_NR* T1 I3
ndb/test/run-test/daily-basic-tests.txt:
  fix testDict -n Restart_NR* T1 I3
 2006-11-02 14:53:28 +01:00
unknown
3364aa1917 ndb - flush signal log when it is turned off 
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  flush signal log when it is turned off or whatever
 2006-11-02 14:37:52 +01:00
unknown
a446b5fec9 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19352
 2006-11-02 12:38:45 +00:00
unknown
540a69c345 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-4.1/bug19352 
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19352


ndb/src/kernel/vm/SimulatedBlock.cpp:
  Change the function name different in 5.0 and 4.1.
 2006-11-02 10:40:46 +00:00
unknown
413d2e28b6 Merge bodhi.local:/opt/local/work/mysql-4.1-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge


mysql-test/r/ndb_update.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
 2006-11-02 02:38:41 +03:00
unknown
98575bb401 BUG#19352 return exact error message when parameters overflow in 32-bit platform. 
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Return exact error message when parameters overflow in 32-bit platform.
 2006-11-01 18:23:30 +00:00
unknown
0c9fc6ba40 ndb - revert bug to wait for "proper" bug fix 
bug#21052


ndb/src/mgmsrv/Services.cpp:
  revert bug to wait for "proper" bug fix
 2006-11-01 16:14:49 +01:00
unknown
b389038132 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb-bj 
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052
 2006-11-01 14:36:31 +00:00
unknown
e997b3622a BUG#21052 Modify the overflow error existed in last patch. 
ndb/include/ndbapi/ndberror.h:
  Change unsigned int to int
ndb/src/mgmsrv/Services.cpp:
  Modify the overflow error existed in last patch. Change ther length of m_text to 512.
ndb/src/ndbapi/ndberror.c:
  Change the parameter of ndb_error_string from unsinged int to int.
 2006-11-01 10:50:19 +00:00
unknown
3e2dacaeaf Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2006-10-27 23:54:57 +02:00
unknown
7577630572 Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2006-10-27 23:54:24 +02:00
unknown
16d6c0b236 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
 2006-10-27 16:41:06 +02:00
unknown
ba583978ea Merge perch.ndb.mysql.com:/home/jonas/src/41-work 
into  perch.ndb.mysql.com:/home/jonas/src/50-work


ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
 2006-10-27 16:34:22 +02:00
unknown
11ac490779 ndb - valgrind 
Still leakage, make sure all unlinked operations are put back so they will be release
  (on failing blob operations, when AO_IgnoreError)


ndb/src/ndbapi/NdbConnection.cpp:
  Still leakage, make sure all unlinked operations are put back so they will be release
 2006-10-27 16:32:59 +02:00
unknown
18f66e026e BUG#22301 ndb: File_class::size() is not thread safe 
ndb/include/logger/FileLogHandler.hpp:
  use off_t for file offset
ndb/include/util/File.hpp:
  use off_t for returning file offset (size)
ndb/src/common/util/File.cpp:
  make File_class::size(FILE*) safe when having multiple threads writing to
  the file
 2006-10-27 18:59:20 +10:00
unknown
b824488335 BUG#22310 dead/deceptive code in FileLogHandler::writeFooter() and File_class::flush 
make the File_class::flush() method actually flush the stdio buffers.


ndb/src/common/logger/FileLogHandler.cpp:
  remove misleading comment
ndb/src/common/util/File.cpp:
  actually flush the stdio buffers.
  
  remove unneeded // private comment
 2006-10-27 18:08:08 +10:00