Commit graph

20964 commits

Author SHA1 Message Date
unknown
536fe1fafa Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-10-11 14:13:53 +02:00
unknown
311abf108b ndb - bug#22893
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)
2006-10-06 16:05:46 +02:00
unknown
0693c2389b ndb - bug#22892
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
2006-10-04 12:05:24 +02:00
unknown
3e260302c5 Merge perch.ndb.mysql.com:/home/jonas/src/merge-mysql-4.1-ndb-bj-to-mysql-4.1-ndb/mysql-4.1-ndb-bj
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-10-04 10:08:46 +02:00
unknown
42070e192e Merge perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-4.1-ndb
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb-bj
2006-09-29 11:47:35 +02:00
unknown
a0a664c837 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-ndb-bj
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-bug-19651
2006-09-28 19:26:29 +08:00
unknown
973ec24e73 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-09-26 16:11:55 +02:00
unknown
add68c0c02 ndb - bug#15303
Fix take-over during SR, remove coupling to lcp/gcp (if systemRestartOngoing())


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix take-over during SR
2006-09-26 15:20:10 +02:00
unknown
5ad0f036b1 ndb - bug#22672
handle also CS_CONNECTED as "abort" in handleFailedApi to keep from falling on assertion in releaseApiCon
    in case of committed dirtyRead


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  handle also CS_CONNECTED as "abort" to keep from falling on assertion in releaseApiCon
    in case of committed dirtyRead
2006-09-26 15:04:44 +02:00
unknown
4b6e6da681 ndb - bug#20895
Fix occational LCP hang!!!
  Make sure only to consider alive nodes in startNextChkpt


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make sure only to consider alive nodes in startNextChkpt
2006-09-26 13:19:00 +02:00
unknown
d743ce1ef1 fix for bug#19651, if temporary error occured while retoring, report it in the restore result.
ndb/tools/restore/consumer.hpp:
  added a function to judge whether there is temporary error.
ndb/tools/restore/consumer_restore.cpp:
  record when temporary error occured in restore.
ndb/tools/restore/consumer_restore.hpp:
  added a member to record temporary error in restore.
ndb/tools/restore/restore_main.cpp:
  report temporary error in restore.
2006-09-26 11:03:11 +08:00
unknown
abdc8c11f9 Merge willster.(none):/home/stewart/Documents/MySQL/4.1/ndb
into  willster.(none):/home/stewart/Documents/MySQL/4.1/ndb_size_51
2006-09-19 17:56:25 +10:00
unknown
27f07d17ad BUG#21585 The --help option shows a screen of command options for the ndbd,ndb_mgmd, ndb_mgm
and other commands related to ndb. For all of these, the help screen contains 
          "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.


ndb/include/util/ndb_opts.h:
  Change help info from Ndb.cfg to my.cnf in the header file.
ndb/test/ndbapi/flexScan.cpp:
  Change help info from Ndb.cfg to my.cnf.
ndb/tools/ndb_config.cpp:
  Change help info from Ndb.cfg to my.cnf
2006-09-19 11:15:50 +08:00
unknown
861425a0da BUG#21530 The ndb_mgm management client doesn't set the exit status on errors, making it
almost useless for any kind of shell script automation.
          Now add the return value that indicates the execution whether or not success 
          for many methods.


ndb/src/mgmclient/CommandInterpreter.cpp:
  Many methods add the return value that indicates whether the execution of operatioin succeeds.
  This can make ndb_mgm management client set the exit status on errors.
2006-09-15 20:04:59 +08:00
unknown
931af3194b ndb - bug#21756
Fix for alter table when node is down...that could cause pain and misery


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Make sure to check table version before retriving from disk
2006-09-15 11:34:06 +02:00
unknown
ec2512cf18 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-09-05 15:05:52 +02:00
unknown
1039540807 BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong result
Fix an error in the bug fix.


sql/sql_select.cc:
  Use a local variable to iterate over group items, since
  'group' is used later in a condition.
2006-09-04 16:53:03 +03:00
unknown
19dc0e4173 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb


sql/log.cc:
  Auto merged
2006-09-04 14:45:13 +02:00
unknown
d2d605e4ea bug#21965 - replication
fix deadlock if master switches log file in parallell with "show master logs"
  


sql/log.cc:
  add raw_get_current_log which dont take log mutex
sql/sql_class.h:
  add raw_get_current_log which dont take log mutex
sql/sql_repl.cc:
  Fix lock order i.e first log_lock then index_lock
2006-09-04 13:43:34 +02:00
unknown
b133be170a Merge lamia.home:/home/timka/mysql/src/4.1-virgin
into  lamia.home:/home/timka/mysql/src/4.1-bug-21787


sql/sql_select.cc:
  Auto merged
2006-09-01 17:21:49 +03:00
unknown
b017caefbd Fix for BUG#21787: COUNT(*) + ORDER BY + LIMIT returns wrong result
The problem was due to a prior fix for BUG 9676, which limited
the rows stored in a temporary table to the LIMIT clause. This
optimization is not applicable to non-group queries with aggregate
functions. The fix disables the optimization in this case.


mysql-test/r/limit.result:
  Test case for BUG#21787
mysql-test/t/limit.test:
  Test case for BUG#21787
sql/sql_select.cc:
  If there is an aggregate function in a non-group query,
  materialize all rows in the temporary table no matter if
  there is a LIMIT clause. This is necessary, since the
  aggregate functions must be computed over all result rows,
  not just the first LIMIT rows.
2006-09-01 15:07:04 +03:00
unknown
49e2267ebd Backport from 5.0
- Dont test "encrypt" in ctype_ucs


mysql-test/r/ctype_ucs.result:
  Don't test "encrypt" function in ctype_ucs.test
mysql-test/t/ctype_ucs.test:
  Don't test "encrypt" function in ctype_ucs.test
2006-09-01 11:21:12 +02:00
unknown
beb24fbdeb Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
2006-09-01 10:32:12 +02:00
unknown
6453d413da Merge bk-internal:/home/bk/mysql-4.1-maint
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-09-01 10:26:01 +02:00
unknown
1bb1679c19 Add target to make "mtr", shortcut for running test suite
BitKeeper/etc/ignore:
  Added mysql-test/mtr to the ignore list
2006-09-01 10:21:08 +02:00
unknown
efeafb2536 Fix for BUG#21345, Error in cluster logfile rotation.
Fixed the cluster logfile rotation code, let the cluster logfile be renamed correctly when the main logfile exceeds the configured maximum size.


ndb/include/util/File.hpp:
  Fix for BUG#21345, Error in cluster logfile rotation.
ndb/src/common/logger/FileLogHandler.cpp:
  Fix for BUG#21345, Error in cluster logfile rotation.
ndb/src/common/util/File.cpp:
  Fix for BUG#21345, Error in cluster logfile rotation.
2006-09-01 15:32:40 +08:00
unknown
f6aec93d79 Merge bk-internal:/home/bk/mysql-4.1-maint
into  rama.(none):/home/jimw/my/mysql-4.1-21288
2006-08-31 21:23:25 -07:00
unknown
3cb03194fd Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2006-08-31 12:45:49 -04:00
unknown
757401a889 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/no-strange-literals/my41-no-strange-literals
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint


tests/mysql_client_test.c:
  Auto merged
2006-08-31 11:30:14 -04:00
unknown
22da915b62 Bitkeeper's Tk interface uses UTF8 by default, so mixing charsets in a
single file is a bad practice.  


tests/mysql_client_test.c:
  Replace literal characters which don't make sense in UTF8 with ubiquitously-
  understood numbers.
2006-08-31 11:14:04 -04:00
unknown
0f342b6ada Merge maint2.mysql.com:/data/localhome/tsmith/bk/g41
into  maint2.mysql.com:/data/localhome/tsmith/bk/41
2006-08-31 00:23:15 +02:00
unknown
f468d0004f Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41
into  maint2.mysql.com:/data/localhome/tsmith/bk/41


BUILD/SETUP.sh:
  Auto merged
2006-08-30 23:49:21 +02:00
unknown
8fb0f8a249 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my40-bug04053
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug04053/my41-bug04053


mysys/my_read.c:
  Auto merged
2006-08-30 17:33:28 -04:00
unknown
626abc5205 Bug#4053: too many of "error 1236: 'binlog truncated in the middle of \
event' from master"

Since there is no repeatable test case, and this is obviously wrong, this is
the most conservative change that might possibly work.  

The syscall  read()  wasn't checked for a negative return value for an
interrupted read.  The kernel  sys_read()  returns -EINTR, and the "library" 
layer maps that to return value of -1 and sets  errno  to EINTR.  It's 
impossible (on Linux) for  read()  to set errno EINTR without the return 
value being -1 .

So, if we're checking for EINTR behavior, we should not require that the
return value be zero.


mysys/my_read.c:
  The read() syscall should check for negative one, since that (usually) signals
  errors (like being interrupted) and zero (usually) signals end-of-file .
2006-08-30 17:28:34 -04:00
unknown
077b649aef Remove ^Z from ctype_ucs.test data, to avoid problems testing on Windows 2006-08-30 22:39:23 +02:00
unknown
71583c893a portability fix in BUILD/* for solaris 2006-08-30 21:24:09 +02:00
unknown
4321eb12fa Merge maint2.mysql.com:/data/localhome/tsmith/bk/bfx/40
into  maint2.mysql.com:/data/localhome/tsmith/bk/bfx/41


BUILD/SETUP.sh:
  SCCS merged
2006-08-30 20:04:33 +02:00
unknown
ddb9f8668f Bug#20393 User name truncation in mysql client
Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte


include/mysql_com.h:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  added new constants NAME_BYTE_LEN, USERNAME_BYTE_LENGTH, SYSTEM_CHARSET_MBMAXLEN
mysql-test/r/ctype_utf8.result:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  test case
mysql-test/t/ctype_utf8.test:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  test case
sql-common/client.c:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  increased buffers for user name & db
sql/sql_acl.cc:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  check that user name is not longer than USERNAME_LENGTH symbols
sql/sql_parse.cc:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  increased buffers for user name & db
sql/table.cc:
  Bug#20393 User name truncation in mysql client
  Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
  check that db name is not longer than NAME_LEN symbols
2006-08-30 15:56:17 +05:00
unknown
f1c83e7266 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  maint2.mysql.com:/data/localhome/tsmith/bk/41
2006-08-29 03:58:38 +02:00
unknown
09eee30bba Merge maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/40
into  maint1.mysql.com:/data/localhome/tsmith/bk/bugfixin/41


BUILD/SETUP.sh:
  SCCS merged
2006-08-29 01:15:54 +02:00
unknown
06707e20bc minor portability fix in SETUP.sh 2006-08-29 01:13:06 +02:00
unknown
2416a453eb Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-27 23:43:11 +04:00
unknown
85c064f6b1 Merge moonbone.local:/work/tmp_merge-4.1-mysql
into  moonbone.local:/work/tmp_merge-4.1-opt-mysql
2006-08-26 23:11:34 +04:00
unknown
9aa12815b3 Dont' ever use cluster for slave in 4.1 2006-08-26 18:38:42 +02:00
unknown
48966da630 Ignore --skip-im if specified on command line
Null merge to 5.0


mysql-test/mysql-test-run.pl:
  Ignore --skip-im if specified on command line
2006-08-25 17:01:04 +02:00
unknown
30031bbf37 Add mysqld-max-nt to list of mysqld executales to look for on windows 2006-08-25 15:23:42 +02:00
unknown
28db55a795 Backport from 5.0 a fix that will start ndb only for tests that needs it
mysql-test/lib/mtr_cases.pl:
  Detect which tests that need ndb
mysql-test/lib/mtr_match.pl:
  Add function mtr_match_substring
mysql-test/mysql-test-run.pl:
  Only start cluster for test cases that need it
2006-08-25 15:17:03 +02:00
unknown
db2a86ce8f Fix running tests suite with non standard tmp dir.
Default is "var/tmp" 


mysql-test/r/myisam.result:
  Update result file
mysql-test/t/myisam.test:
  If running test suite with a non standard tmp dir, the "show create table" will print "DATA DIRECTORY="
  Use replace_result to mask it out
  Set tmpdir to var/log to get the printout of DATA DIRECTORY also when running with standard tmpdir
2006-08-25 10:46:14 +02:00
unknown
6c21bdb949 Merge bk-internal:/home/bk/mysql-4.1-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
2006-08-25 10:11:55 +02:00
unknown
72695c3fae Backport fix for finding executables from 5.0
mysql-test/lib/mtr_misc.pl:
  On windows the exe does not need to be executable for it to be found
2006-08-25 10:11:15 +02:00