- 18 Oct, 2006 3 commits
-
-
unknown authored
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb mysql-test/r/ndb_charset.result: Auto merged sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug21253
-
unknown authored
Early abort, failing to allocate buffers, would go down the abort track and end up trying to sendDropTriggers (as the standard stop backup does). However, it is possible to not have any tables yet defined in the backup (due to allocating buffers is before this). Simple check in sendDropTrig (and continue to next step). Files may be open, so we continue to close them. Also updated ERROR_Codes (and added one to test this bug). storage/ndb/src/kernel/blocks/ERROR_codes.txt: update BACKUP error insert codes to reflect current reality. storage/ndb/src/kernel/blocks/backup/Backup.cpp: Allow for early abort when no tables have been included in backup. Allow for abort when file records have been seized but not yet allocated to specific uses (is the case when buffer allocation fails) storage/ndb/src/kernel/blocks/backup/Backup.hpp: initialize BackupRecord file Ptrs storage/ndb/test/src/NdbBackup.cpp: Add extra failure codes for buffer allocation failure in backup
-
- 17 Oct, 2006 4 commits
-
-
unknown authored
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1 sql/ha_ndbcluster.cc: Auto merged
-
unknown authored
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
-
unknown authored
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-is_files_refactor
-
unknown authored
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-is_files_refactor sql/ha_ndbcluster.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_show.cc: Auto merged
-
- 16 Oct, 2006 11 commits
-
-
unknown authored
into dator5.(none):/home/pappa/bug18198 mysql-test/r/partition.result: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_partition.cc: Auto merged sql/ha_partition.h: Auto merged sql/item_func.h: Auto merged sql/partition_info.cc: Auto merged sql/sql_partition.cc: Auto merged sql/sql_partition.h: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/item_cmpfunc.h: e
-
unknown authored
mysql-test/r/ndb_basic.result: replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/r/ndb_blob.result: replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/r/ndb_charset.result: replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/r/ndb_condition_pushdown.result: replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/r/ndb_dd_sql_features.result: replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/r/ndb_subquery.result: replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/t/ndb_basic.test: replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/t/ndb_blob.test: replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/t/ndb_charset.test: replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/t/ndb_condition_pushdown.test: replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/t/ndb_dd_sql_features.test: replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count mysql-test/t/ndb_subquery.test: replace explain 'rows' by '#' since it depends usually on non-deterministic index stats or non-exact row count
-
unknown authored
Bug #21072 Duplicate key error in NDB references wrong key: Added new printout for duplicate key error when key is unknown
-
unknown authored
Bug #21072 Duplicate key error in NDB references wrong key: Added new printout for duplicate key error when key is unknown
-
unknown authored
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1 mysql-test/r/ndb_charset.result: Using local, will re-generate mysql-test/r/ndb_index_unique.result: Using local, will re-generate
-
unknown authored
-
unknown authored
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21191
-
unknown authored
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1 mysql-test/r/ndb_charset.result: Usin g local, will re-generate. mysql-test/r/ndb_index_unique.result: Using local, will re-generate mysql-test/r/ndb_update.result: Using local, will re-generate sql/ha_ndbcluster.cc: Merge sql/handler.cc: Merge
-
unknown authored
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0 mysql-test/r/ndb_charset.result: Auto merged mysql-test/r/ndb_index_unique.result: Auto merged mysql-test/r/ndb_update.result: Auto merged sql/ha_ndbcluster.cc: Merg sql/handler.cc: Merge
-
unknown authored
config/ac-macros/ha_ndbcluster.m4: re-introduce NDB_SIZEOF substitutions to prevent NdbApi depending on my_config which causes problems for autotools enabled ndbapi programs storage/ndb/include/ndb_types.h.in: remove dependency on my_config.h that was causing problems for ndbapi programs using autoconf
-
unknown authored
into mysql.com:/windows/Linux_space/MySQL/mysql-5.0 sql/ha_ndbcluster.cc: Auto merged
-
- 15 Oct, 2006 1 commit
-
-
unknown authored
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21191 sql/mysqld.cc: Auto merged
-
- 13 Oct, 2006 5 commits
-
-
unknown authored
Fix for bug#23169 - memset param switching storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp: Fix for bug#23169 - memset param switching
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real include/violite.h: SCCS merged sql/net_serv.cc: SCCS merged vio/viosocket.c: SCCS merged
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real include/violite.h: SCCS merged sql/net_serv.cc: SCCS merged vio/viosocket.c: SCCS merged
-
unknown authored
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug9678 BitKeeper/deleted/.del-lib_vio.c~d779731a1e391220: Use local. include/violite.h: Use local. sql/net_serv.cc: Use local. vio/viosocket.c: Use local.
-
unknown authored
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
-
- 12 Oct, 2006 6 commits
-
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/51-work storage/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/51-work storage/ndb/src/kernel/blocks/ERROR_codes.txt: Auto merged storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: merge
-
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 6 commits
-
-
unknown authored
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1 sql/log.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
-
unknown authored
into neptunus.(none):/home/msvensson/mysql/mysql-5.1 BitKeeper/etc/collapsed: auto-union BitKeeper/etc/ignore: auto-union Makefile.am: Auto merged client/mysql.cc: Auto merged include/m_ctype.h: Auto merged include/my_global.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/lib/mtr_process.pl: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/ctype_utf8.test: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/trigger.test: Auto merged sql/field.cc: Auto merged sql/filesort.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/set_var.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_update.cc: Auto merged
-
unknown authored
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
-
- 10 Oct, 2006 4 commits
-
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.1-merge include/my_sys.h: Auto merged mysql-test/t/view.test: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/share/errmsg.txt: Auto merged sql/slave.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged
-
unknown authored
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
-
unknown authored
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/tools/restore/restore_main.cpp: Auto merged
-
unknown authored
ndb_restore Return OK even if temporary errors (otherwise mysql-test-run/ndb_restore can fail on really slow machines) storage/ndb/tools/restore/restore_main.cpp: Return OK even if temporary errors
-