- 12 Oct, 2006 4 commits
-
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged
-
unknown authored
note this does not happen in 5.0, but i'm committing it here to keep code same between 5.0 and 5.1 ndb/src/ndbapi/NdbScanOperation.cpp: missing if for bug#21941
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/50-work ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/ERROR_codes.txt: merge
-
unknown authored
Fix race-condition between COPY_GCIREQ (GCP) and lcpSetActiveStatusEnd Solution is _not_ to copy sysfileData from COPY_GCIREQ from "self" ndb/src/kernel/blocks/ERROR_codes.txt: Add error insert for dealying of copy sysfileData ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: 1) Add error insert for delaying of sysfileData 2) Change to that master is _not_ copying sysfileData from COPY_GCIREQ as it might be updating it while COPY_GCIREQ is "in the fly"
-
- 11 Oct, 2006 2 commits
-
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb mysql-test/r/ctype_utf8.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_view.cc: Auto merged sql/table.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
- 10 Oct, 2006 6 commits
-
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
-
unknown authored
into trift2.:/MySQL/M50/push-5.0 sql/sql_insert.cc: Auto merged sql/sql_select.cc: Auto merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
-
unknown authored
fix bug in test prg
-
unknown authored
fix bug in handling of inactive timeout for scan, when all is delivered ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: 1) set timeout if all scans are at api 2) Use c_appl_timeout_value when getting scan timeout ndb/test/ndbapi/testTimeout.cpp: test program
-
- 08 Oct, 2006 3 commits
- 06 Oct, 2006 9 commits
-
-
unknown authored
Add checking of REDO to earlier during SR so take-over of node can be performed if it can't be restarted using logs (which btw is really weird...as it _should_ be able to use logs of other node in node group) Otherwise cluster could be started and 1 fragment on one node could not have been restored Making the cluster inconsisten, VERY BAD ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Break-out methods which searches for REDO for a fragment, so it can be used earlier during SR ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Add checking of REDO to earlier during SR so take-over of node can be performed if it can't be restarted using logs (which btw is really weird...as it _should_ be able to use logs of other node in node group)
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-engines sql/ha_myisammrg.cc: Manual merge.
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-4.1-engines
-
unknown authored
This is addition to fix for bug21617. Valgrind reports an error when opening merge table that has underlying tables with less indexes than in a merge table itself. Copy at most min(file->keys, table->key_parts) elements from rec_per_key array. This fixes problems when merge table and subtables have different number of keys. sql/ha_myisammrg.cc: Copy at most min(file->keys, table->key_parts) elements from rec_per_key array. This fixes problems when merge table and subtables have different number of keys.
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines mysql-test/r/ndb_update.result: Auto merged mysql-test/t/ndb_update.test: Auto merged
-
unknown authored
-
unknown authored
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG10974/mysql-5.0-engines BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e: Auto merged mysql-test/r/merge.result: Manual merge.
-
unknown authored
-
- 05 Oct, 2006 6 commits
-
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-5.0-engines mysql-test/r/ndb_update.result: Auto merged mysql-test/t/ndb_update.test: Auto merged sql/sql_update.cc: Manual merge.
-
unknown authored
into mysql.com:/home/svoj/devel/mysql/BUG21381/mysql-4.1-engines
-
unknown authored
into willster.(none):/home/stewart/Documents/MySQL/5.0/bug13987-5.0_bugfixonly ndb/include/mgmapi/mgmapi.h: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged
-
unknown authored
Though this is not storage engine specific problem, I was able to repeat this problem with BDB and NDB engines only. That was the reason to add a test case into ndb_update.test. As a result different bad things could happen. BDB has removed duplicate rows which is not expected. NDB returns an error. For multi table update notify storage engine about UPDATE IGNORE as it is done in single table UPDATE. mysql-test/r/ndb_update.result: A test case for bug#21381. mysql-test/t/ndb_update.test: A test case for bug#21381. sql/sql_update.cc: For multi table update notify storage engine about UPDATE IGNORE as it is done in single table UPDATE.
-
unknown authored
smaller patch for 5.0. complete patch going to 5.1 due to more intrusiveness for 'list sessions' etc ndb/include/mgmapi/mgmapi.h: add internal get_fd to use in test ndb/include/util/InputStream.hpp: - add this weird startover member to SocketInputStream - this helps work out if we've read a newline yet and should start inserting into buffer from the start ndb/src/common/util/InputStream.cpp: remove evil, add more. keep track internally we've retrieved a newline yet (m_startover) ndb/src/common/util/Parser.cpp: change way detecting of NoLine remove some trailing whitespace that was uglying the place up a bit ndb/src/common/util/socket_io.cpp: Always retrieve data from the OS so that we instantly get EOF on disconnect and don't end up spinning looking for a newline. ndb/src/mgmapi/mgmapi.cpp: add internal ndb_mgm_get_fd() for internal testing handle 'node status' a bit better ndb/test/ndbapi/testMgm.cpp: Add test for MgmApiSession disconnection (mgmd at 100%) not fully automated due to smaller patch for 5.0 will be complete in 5.1
-
unknown authored
into mysql.com:/home/gluh/MySQL/Merge/5.0-kt
-
- 04 Oct, 2006 2 commits
-
-
unknown authored
Make sure checkKeepGci is also run on oldStoredReplicas to prevent keepgci to move backwards when crash node restarts ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Make sure checkKeepGci is also run on oldStoredReplicas to prevent keepgci to move backwards when crash node restarts
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb ndb/include/mgmapi/mgmapi.h: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged ndb/include/ndb_version.h.in: merge
-
- 03 Oct, 2006 8 commits
-
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint sql/item_func.cc: Auto merged sql/log.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.h: Auto merged
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix-2 sql/sql_select.cc: Auto merged
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix sql/sql_select.cc: Auto merged
-
unknown authored
into booka.:/home/alik/MySQL/devel/5.0-rt
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix sql/sql_select.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint BitKeeper/etc/collapsed: auto-union mysql-test/lib/mtr_process.pl: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ps.result: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/sql_acl.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint client/mysql.cc: Auto merged include/m_ctype.h: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/field.cc: Auto merged sql/item_func.cc: Auto merged
-
unknown authored
wrong results in order by in some rare cases.
-