Commit graph

17991 commits

Author SHA1 Message Date
unknown
d69c6e85fa bug#9969 - ndb
missleading error message


ndb/test/src/NdbBackup.cpp:
  typo
2005-04-22 09:40:44 +02:00
unknown
d9faad9c1a bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
bug#9960 - ndb backup
      increase wait completed timeout to 48 hours


ndb/include/kernel/signaldata/BackupImpl.hpp:
  Add nodeid to reply to be able to fake reply during NF
ndb/include/kernel/signaldata/BackupSignalData.hpp:
  new error codes
ndb/src/common/debugger/signaldata/BackupImpl.cpp:
  fix printout
ndb/src/kernel/blocks/backup/Backup.cpp:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/Backup.hpp:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/Backup.txt:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/backup/BackupInit.cpp:
  bug#9924 - ndb backup abort handling
    Redo abort handling according to descr. in Backup.txt
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Init own version
ndb/src/mgmapi/mgmapi.cpp:
  bug#9960 - ndb backup
    increase wait completed timeout to 48 hours
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Handle node failures activly
    (mainly for backup...)
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Handle node failures activly
    (mainly for backup...)
ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp:
  Handle node failures activly
    (mainly for backup...)
ndb/src/ndbapi/ndberror.c:
  new error codes
ndb/test/ndbapi/testBackup.cpp:
  fix return codes
ndb/test/run-test/daily-basic-tests.txt:
  Add failure test cases to autotest
ndb/test/src/NdbBackup.cpp:
  fix error codes
  introduce checking of backup resources after each test
2005-04-22 09:07:25 +02:00
unknown
135c7b5a1d bug#9892
Make BUILDINDX RF_LOCAL aware


ndb/src/ndbapi/Ndbif.cpp:
  allow TCKEY_FAILREF w/ invalid magic number also when NDB_NODROPPED_SIGNAL
ndb/test/ndbapi/testIndex.cpp:
  Run only 1 update thread during NFNR2_O
2005-04-18 12:41:12 +02:00
unknown
5a1af9ed8c BUG#9891 - ndb lcp
Crash if ACC_CONTOPREQ was sent while ACC_LCPCONF was in job buffer
  if ACC_LCPCONF would have arrived eariler (before TUP_LCPSTARTED)
  operations could lockup. 
  But would be restarted on next LCP

-- LQH
1) Better check for LCP started that will also return true
   if ACC or TUP already has completed
    
2) Remove incorrect if statement that prevented operations to
   be started if ACC has completed

-- ACC
Make sure all ACC_CONTOPCONF are sent before releasing lcp record
  i.e. use noOfLcpConf == 4 (2 ACC_LCPCONF + 2 ACC_CONTOPCONF)

Check for == 4 also when sending ACC_CONTOPCONF


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Make sure all ACC_CONTOPCONF are sent before releasing lcp record
    i.e. use noOfLcpConf == 4 (2 ACC_LCPCONF + 2 ACC_CONTOPCONF)
  
  Check for == 4 also when sending ACC_CONTOPCONF
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Remove LCP_STARTED state
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  1) Better check for LCP started that will also return true
     if ACC or TUP already has completed
  
  2) Remove incorrect if statement that prevented operations to
     be started if ACC has completed
2005-04-14 13:43:07 +02:00
unknown
06c001ecaa BUG#9749 - ndb lock upgrade - more fixes...
1) Make getNoParall into function instead of a procedure
2) Check for multiple transactions in "upgrade's" parallell queue
3) Set lock mode according to lock_owner's lockMode

NOTE: Does still not handle lock upgrade in case of aborts correctly


ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  Make getNoParall into function instead of a procedure
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  1) Make getNoParall into function instead of a procedure
  2) Check for multiple transactions in "upgrade's" parallell queue
  3) Set lock mode according to lock_owner's lockMode
2005-04-13 09:54:40 +02:00
unknown
59acb039fb bug#9749 - ndb lock upgrade
handle more cases...


ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
  bug#9749 - ndb lock upgrade
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  bug#9749 - ndb lock upgrade
ndb/test/ndbapi/testOperations.cpp:
  bug#9749 - ndb lock upgrade
2005-04-12 17:54:34 +02:00
unknown
3fcbdd761c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-04-12 13:56:58 +02:00
unknown
efd06e1910 bug#9757 - ndb - post review
use DBUG_RETURN


ndb/src/mgmsrv/MgmtSrvr.cpp:
  bug#9757 - ndb
    use DBUG_RETURN
2005-04-12 13:56:24 +02:00
unknown
583d38f3f7 bug#9757 - ndb
Impl. stupid mgm lock against shutting down 2 nodes simultaniously
  Add some more dump


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Impl. 2 new dump 
  1) to query nf handling state
  2) that impl. sending of arbitrary signal...
     to be used with extreme care
ndb/src/kernel/main.cpp:
  enable critical and warnings in out file
ndb/src/mgmsrv/MgmtSrvr.cpp:
  call handleStopReply on nfCompleteRep instead
ndb/src/mgmsrv/MgmtSrvr.hpp:
  call handleStopReply on nfCompleteRep instead
2005-04-12 13:36:43 +02:00
unknown
c99e332cf1 backport kill.test fix from 5.0 2005-04-11 22:36:07 +02:00
unknown
b3842e107c Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-04-11 20:49:19 +02:00
unknown
65255d3540 don't check record's checksum in REPAIR
myisam/mi_dynrec.c:
  new parameter for _mi_rec_check().
myisam/myisamdef.h:
  new parameter for _mi_rec_check().
2005-04-11 20:04:50 +02:00
unknown
08b89a2b74 In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).



sql/share/Makefile.am:
  using "all:" leads to double-"all:" in Makefile (counting the auto-generated);
  all-local is the standard way to add something to all: (thanks Konstantin)
configure.in:
  Don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end of configure.in
  because config.status may later need this file (if it does not find it
  it won't incorporate dependencies of errmsg.sys in sql/share/Makefile :( )
2005-04-11 17:37:49 +02:00
unknown
6bf0fcd136 Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
2005-04-11 16:47:39 +02:00
unknown
30a82dfb7d Fix for BUG#9149 "OPTIMIZE TABLE statement on InnoDB table is logged twice in the binary log"
if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).


sql/sql_table.cc:
  When optimizing a table, if we fall back to mysql_alter_table()
  (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
  is not supposed to do any binlogging (it is done by the caller).
2005-04-11 16:46:03 +02:00
unknown
cd0ceaf8c8 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-11 09:19:49 -05:00
unknown
93b4fbea92 Merging fix for bug #9796 "Query Cache caches queries with CURRENT_USER()
function" into 4.1 tree.
2005-04-11 10:44:48 +04:00
unknown
d79e696952 Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796
into mysql.com:/home/dlenev/src/mysql-4.1-merges


sql/item_create.cc:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
2005-04-11 09:53:54 +04:00
unknown
3e0a626367 Fix for bug #9796 "Query Cache caches queries with CURRENT_USER()
function".

We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.


mysql-test/r/query_cache.result:
  Let us test that queries with CURRENT_USER() function are not cached.
mysql-test/t/query_cache.test:
  Let us test that queries with CURRENT_USER() function are not cached.
sql/item_create.cc:
  create_func_current_user():
    We should not cache queries which use CURRENT_USER() function.
2005-04-11 00:30:23 +04:00
unknown
ebdf2c0153 ctype_collate.result, ctype_collate.test, union.result, union.test:
fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.


sql/item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.
mysql-test/t/union.test:
  fixing tests accordingly
mysql-test/r/union.result:
  fixing tests accordingly
mysql-test/t/ctype_collate.test:
  fixing tests accordingly
mysql-test/r/ctype_collate.result:
  fixing tests accordingly
2005-04-10 12:40:33 +05:00
unknown
f2824c4d60 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug6776.1
2005-04-09 07:37:00 +01:00
unknown
fbb21ebfe2 Fix typos in Bug#6776
sql/sql_udf.cc:
  Fix typos
2005-04-09 00:21:51 +01:00
unknown
be400cb092 Merge xiphis.org:/var/db/bk/work-acurtis/bug6776
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1


sql/sql_udf.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-04-08 21:40:50 +01:00
unknown
81b822082a Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-08 14:17:29 -05:00
unknown
dab65c7131 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/mysql-4.1
2005-04-08 22:17:28 +03:00
unknown
c88d49bd76 Bug #9665 After registering MySQL service and starting with shared mem, cannot stop
Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server


sql/mysqld.cc:
  removed the code that set the shared memory connect event since this also being done in kill_server
2005-04-08 09:17:19 -05:00
unknown
0c3d72ab58 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into mdk10.(none):/home/reggie/bk/mysql-4.1
2005-04-08 09:17:18 -05:00
unknown
e1efe79731 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-04-08 16:17:17 +02:00
unknown
7397aeb050 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/clone-4.1.11
configure.in:
  Auto merged
2005-04-08 16:04:37 +02:00
unknown
20b9946d9e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1


ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
2005-04-08 14:16:57 +02:00
unknown
9896cfdf32 bug#9749 - ndb
test case for case 9749, ndb lock upgrade via NDBAPI


ndb/test/ndbapi/testOperations.cpp:
  bug#9749 - test case for case 9749
2005-04-08 14:15:37 +02:00
unknown
b9f486cd02 Add missing parts for the "Cybozu" custom build, to avoid future manual patches.
configure.in:
  Normally, 'configure' does only support "case-insensitive" collations for UTF-8 character sets.
  However, a certain customer requires builds with a "case-sensitive" collation: 'utf8_general_cs'.
  In order to do custom builds without manual patches, this value gets special handling in 'configure'.
  Also, when it is given, the CPP symbol enabling the additional code is set.
mysys/charset-def.c:
  Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.
strings/ctype-utf8.c:
  Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.
2005-04-08 13:56:48 +02:00
unknown
5474a95aa5 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-08 11:39:22 +02:00
unknown
61fed028ba Added more tests for auto_increment 2005-04-08 11:38:40 +02:00
unknown
cbd3334701 Bug #9665 After registering MySQL service and starting with shared mem, cannot stop
The shared memory connect event was not being set in kill_server.
This caused the thread that is handling shared memory connections to never
exit.


sql/mysqld.cc:
  Added code to set the shared memory connect event upon server termination
2005-04-08 00:16:02 -05:00
unknown
22f1d637fd Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1


sql/ha_ndbcluster.cc:
  Auto merged
2005-04-07 20:21:17 +02:00
unknown
ae2f0d9872 Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage, post review fix 2005-04-07 20:08:01 +02:00
unknown
7259aabc37 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-07 17:51:53 +02:00
unknown
606f0a1335 Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-07 17:44:09 +02:00
unknown
3e801322d7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/psergey/mysql-4.1-bug8877


sql/sql_select.cc:
  Auto merged
2005-04-07 17:47:37 +04:00
unknown
ebbe70585a Post-review fixes: local variable renamed 2005-04-07 17:44:48 +04:00
unknown
1780abf26f Added missing DBUG_RETURNs 2005-04-07 12:12:03 +02:00
unknown
f7356d7391 InnoDB: Prevent ALTER TABLE ... ENGINE=...
if there are foreign key constraints on the table. (Bug #5574)


sql/ha_innodb.cc:
  Add method can_switch_engines()
sql/ha_innodb.h:
  Add method can_switch_engines()
sql/handler.h:
  Add method can_switch_engines()
sql/sql_table.cc:
  Check handler::can_switch_engines() before switching storage engines
2005-04-07 12:16:41 +03:00
unknown
0d17aea729 Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.1-clean


client/mysqlcheck.c:
  Auto merged
mysys/my_rename.c:
  Auto merged
2005-04-06 11:02:20 -07:00
unknown
c6bb22936a Merge mysql.com:/home/jimw/my/mysql-4.0-9492
into mysql.com:/home/jimw/my/mysql-4.0-clean
2005-04-06 10:53:09 -07:00
unknown
cde615c9cb InnoDB: Avoid test suite failures caused by a locking conflict
between two server instances at server shutdown/startup.
This conflict on advisory locks appears to be the result of a bug
in the operating system; these locks should be released when the
files are closed, but somehow that does not always happen
immediately in Linux.  (Bug #9381)


innobase/include/os0file.h:
  Add OS_FILE_OPEN_RETRY for os_file_create()ing ibdata1
innobase/os/os0file.c:
  os_file_lock(): Do not close the file on failure, but let the
  callers do that.
  os_file_create(): If create_mode==OS_FILE_OPEN_RETRY and
  os_file_lock() fails, keep retrying for 100 seconds.
innobase/srv/srv0start.c:
  open_or_create_data_files(): Open the first data file with
  OS_FILE_OPEN_RETRY, to resolve a conflict with a shutting-down
  instance of the MySQL server.
2005-04-06 15:09:15 +03:00
unknown
d5b7547597 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-04-06 13:45:14 +02:00
unknown
1216986050 Makefile.am:
Include the Perl version of mysql-test-run
rpl_rewrite_db.test, rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test-run.pl:
  Embedded result files no longer needed


mysql-test/mysql-test-run.pl:
  Embedded result files no longer needed
mysql-test/r/rpl_rewrite_db.result:
  Added missing database cleanup
mysql-test/t/rpl_rewrite_db.test:
  Added missing database cleanup
mysql-test/Makefile.am:
  Include the Perl version of mysql-test-run
2005-04-06 12:20:55 +02:00
unknown
9c642e5b31 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
2005-04-06 15:19:02 +05:00
unknown
3683fc3453 Minor clean-ups for the previous commit.
sql/field.cc:
  Use a separate variable. Otherwise "error" value gets lost
  after well_formed_length call.
strings/ctype-mb.c:
  Don't return an error if we reached end of line.
2005-04-06 15:12:44 +05:00