Commit graph

53052 commits

Author SHA1 Message Date
unknown
cfca20b052 Added random sleeps before retrying temporarly failed DICT signals, to avoid race conditions 2008-02-06 15:08:45 +01:00
unknown
0c0c346010 Merge pilot.mysql.com:/data/msvensson/mysql/bug32044/my51-bug32044
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-06 14:56:32 +01:00
unknown
be5a46a69b Patch to eliminate some valgrind warnings in debug printout code.
sql/rpl_rli.cc:
  Adding variable to mark an instance of Relay_log_info as fake.
sql/rpl_rli.h:
  Adding variable to mark an instance of Relay_log_info as fake.
sql/slave.cc:
  Not printing debug information if we are working with a fake
  instance of Relay_log_info. This because the result of calling
  update is nonsense, and trying to print it generates valgrind
  warnings.
sql/sql_binlog.cc:
  Marking newly created instance of Relay_log_info as a fake instance.
2008-02-06 14:44:47 +01:00
unknown
72de77987e Merge bk-internal:/home/bk/mysql-5.1-new-ndb
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-ndb


storage/ndb/src/common/util/OutputStream.cpp:
  Auto merged
2008-02-06 14:38:08 +01:00
unknown
c6099bac27 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  mysql.com:/Users/davi/mysql/mysql-5.1-runtime
2008-02-06 11:22:18 -02:00
unknown
3616b9136f Bug#32710: SHOW INNODB STATUS requires SUPER
Changed "SHOW ENGINE ... STATUS" and "SHOW ENGINE ... MUTEX"
to require the PROCESS privilege, instead of SUPER.

Fixed by Damien Katz


mysql-test/r/show_check.result:
  Add test case result for Bug#32710
mysql-test/t/show_check.test:
  Add test case for Bug#32710
sql/sql_parse.cc:
  Require PROCESS privilege instead of SUPER.
2008-02-06 11:20:15 -02:00
unknown
047d7d0791 Raise version number after cloning 5.0.56 2008-02-06 14:18:26 +01:00
unknown
7fb34527df Merge mysql.com:/data0/mysqldev/my/mysql-5.0
into  mysql.com:/data0/mysqldev/my/build-200802061048-5.0.56/mysql-5.0-release


configure.in:
  Merge from main.
2008-02-06 14:13:05 +01:00
unknown
e156d6af4d ndb - bug#34216
During TC-take-over (NF) the new-TC builds up a new transaction state
  And commits operation according to this state.
  However, in the new state that is build, the operations does not have to be in same order, as "real" state
  In the multi-update-case, this means that operations can be commit in "incorrect" order

  i.e update A, delete A, insert A is normally commited in same order as prepared
      but can be committed in any order

  This patch changes TUP handling of these out-order commits, and previous implementation
    could confuse the TUX triggers


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  new method
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  move removeActiveOpList, cause it's now only used by DbtupAbort
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  - move tux-trigger execution *before* check of disk, since ops can be committed during a disk timeslice
  - allow out-of-order commits and use tuple_ptr->m_operation_ptr_i for determening "real" commit
    (instead of re-ordering operations on the fly, which confused tux-triggers)
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  use constant instead of number
storage/ndb/test/run-test/daily-basic-tests.txt:
  "old-51" does not yet support --nologging
2008-02-06 13:06:05 +01:00
unknown
9f8fb5ed04 Add a test case for Bug#21380: DEFAULT definition not always
transfered by CREATE TABLE/SELECT to the new table.


mysql-test/r/create.result:
  Update result file.
2008-02-06 14:55:19 +03:00
unknown
7335532a50 Merge pilot.mysql.com:/data/msvensson/mysql/bug19911/my51-bug19911
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build


sql/ha_ndbcluster_binlog.cc:
  Auto merged
2008-02-06 12:52:11 +01:00
unknown
ee42ff6398 Bug#34311 main.lock_multi.test fails
Re-enable the test case for Bug 30331.


mysql-test/r/lock_multi.result:
  Update the test case result for Bug#30331
mysql-test/t/lock_multi.test:
  Re-enable the test case for Bug#30331
2008-02-06 09:40:59 -02:00
unknown
66fa5cb968 Bug#19911 ndb does not work on sol10 x86
sql/ha_ndbcluster_binlog.cc:
  Change 'assert' to 'DBUG_ASSERT' to avoid that the assert is triggered in the optimized version
  on solaris 10 for x86
2008-02-06 11:44:07 +01:00
unknown
2574d83cc8 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2008-02-06 11:42:18 +01:00
unknown
d65318519e ndb - bug#34216
testcases


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  new error codes
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  new error codes
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  remove assert
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  new testcase
  1) -n Bug34216
     Which tests node diying during multip-op commit
     Very controlled
  
  2) -n mixedmultiop
     Runs several threads "load" of same scenario...not very controlled
storage/ndb/test/run-test/daily-basic-tests.txt:
  new testcases
2008-02-06 11:28:43 +01:00
unknown
4c5fb788f8 Fixed differences in STATE in result file for bug#34190.
BitKeeper/etc/ignore:
  Added mysql-test/suite/funcs_1.tar.zip to the ignore list
2008-02-06 11:02:45 +01:00
unknown
8d5a63f0ac Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

Also use the opportunity to fix a bad merge (remove
duplicate code in mysql-test-run.pl).


mysql-test/mysql-test-run.pl:
  Fix bad merge (remove duplicate code adding --user=root arg)
2008-02-05 23:20:12 -07:00
unknown
40f2a6ae99 Minor typo fix for mysql-test-run.pl
mysql-test/mysql-test-run.pl:
  Fix typo (missing $prefix arg to mtr_add_arg(--user=root))
2008-02-05 23:16:52 -07:00
unknown
292477d9f9 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-05 22:42:06 -07:00
unknown
8456c5ffa3 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-05 22:41:10 -07:00
unknown
0994b19002 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-05 22:40:40 -07:00
unknown
6cb9dfed6f Removing duplicate code from mysql-test-run.pl
mysql-test/mysql-test-run.pl:
  Removing duplicate code.
2008-02-06 06:18:06 +01:00
unknown
4c2cdf00cf Merge solace.(none):/home/mtaylor/src/mysql-5.0-build
into  solace.(none):/home/mtaylor/src/mysql-5.1-build


BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged
2008-02-06 05:33:25 +01:00
unknown
52da7a4e1b Strip comments from queries before explaining them. Fixes BUG#34339 2008-02-06 04:33:27 +01:00
unknown
3a59d7af38 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
2008-02-05 16:32:03 -07:00
unknown
7e212f5107 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51


scripts/make_binary_distribution.sh:
  Auto merged
2008-02-05 16:15:07 -07:00
unknown
f328142cdb Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
2008-02-05 16:04:07 -07:00
unknown
781de19688 Updating result file for rpl_loaddata_map.
mysql-test/suite/rpl/r/rpl_loaddata_map.result:
  Result change.
2008-02-05 19:44:16 +01:00
unknown
f0f956958a Fixes to make tests pass on vanilla build.
mysql-test/suite/binlog/t/binlog_old_versions.test:
  Adding --local-load to 'mysqlbinlog' and --local-infile=1 to 'mysql'.
2008-02-05 17:05:59 +01:00
unknown
3b6a71a4b0 Bug show slave status handling segfaults when slave io is about
to leave

The artifact was caused by
a flaw in concurrent accessing the slave's io thd by
the io itself and a handling show slave status thread.
Namely, show_master_info did not acquire mi->run_lock mutex that is
specified for mi->io_thd member.

Fixed with deploying the mutex locking and unlocking. The mutex is kept
short time and without interleaving with mi->data_lock mutex.

Todo: to report and fix an issue with 
    sys_var_slave_skip_counter::{methods} 
seem to acquire incorrectly
     active_mi->rli.run_lock
instead of the specified
     active_mi->rli.data_lock

A test case is difficult to compose, so rpl_packet should continue serving
as the indicator.


sql/slave.cc:
  implementing a TODO left at 4.1 time:
  mending access to mi->io_thd with the specified mutex;
sql/slave.h:
  adding a member name to the list of that run_lock guards.
2008-02-05 17:36:26 +02:00
unknown
4df3bc0c3d Disabling test case.
Bug 34311: main.lock_multi.test fails.


mysql-test/r/lock_multi.result:
  Update result file.
mysql-test/t/lock_multi.test:
  Disabled test case for Bug#30331.
2008-02-05 18:08:02 +03:00
unknown
a63ef17fca Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl


include/my_base.h:
  Auto merged
mysql-test/include/show_binlog_events2.inc:
  Auto merged
mysql-test/suite/binlog/t/binlog_old_versions.test:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt:
  Auto merged
mysql-test/suite/rpl/t/rpl_loaddata_map-slave.opt:
  Auto merged
sql/log_event_old.cc:
  Auto merged
sql/sql_binlog.cc:
  Auto merged
mysql-test/suite/rpl/r/rpl_loaddata_map.result:
  Manual merge.
mysql-test/suite/rpl/r/rpl_user.result:
  Manual merge.
mysql-test/suite/rpl/t/rpl_loaddata_map.test:
  Manual merge.
mysql-test/suite/rpl/t/rpl_user.test:
  Manual merge.
sql/log_event.cc:
  Manual merge.
sql/rpl_record.cc:
  Manual merge.
2008-02-05 14:52:20 +01:00
unknown
fb9c0158b2 Merge pilot.mysql.com:/data/msvensson/mysql/bug31239/my50-bug31239
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
2008-02-05 14:06:59 +01:00
unknown
20b9785284 Merge pilot.mysql.com:/data/msvensson/mysql/bug31239/my51-bug31239
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
2008-02-05 13:53:40 +01:00
unknown
df2cf8c78d Adding some more filtering for tests that kills queries and
cause sporadic, but benign, errors.


mysql-test/lib/mtr_report.pl:
  Filtering out sporadic but benign error in rpl_err_ignoredtable.
2008-02-05 13:31:57 +01:00
unknown
9c58c0b20f Merge pilot.mysql.com:/data/msvensson/mysql/bug31239/my50-bug31239
into  pilot.mysql.com:/data/msvensson/mysql/bug31239/my51-bug31239


storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged
2008-02-05 12:45:42 +01:00
unknown
4db374eb8a Bug#31239 Test "ndb_views" returns NDB error 4259 "Invalid set of range scan bounds"
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Move the increment to next line to avoid icc optimization problem that
  caused the "b" reference to be incremented
2008-02-05 12:44:57 +01:00
unknown
4e1be6221e Fix merge: fix test. 2008-02-05 12:27:52 +03:00
unknown
57c599b3d4 Disabling test case binlog_old_version for embedded server.
mysql-test/lib/mtr_report.pl:
  Ignoring benign error message (killing query causes unpredictable
  error messages).
mysql-test/suite/binlog/t/binlog_old_versions.test:
  Disabling test case for embedded server.
sql/rpl_rli.cc:
  Inititializing uninitialized variable causing valgrind warning.
2008-02-05 08:22:27 +01:00
unknown
4e8ef9c8a2 Patch clean up.
Fixed interference between tests: Users were added but not properly removed.
This caused later tests to fail.


mysql-test/r/grant.result:
  Fixed interference between tests: Users were added but not properly removed.
  This caused later tests to fail.
mysql-test/t/grant.test:
  Fixed interference between tests: Users were added but not properly removed.
  This caused later tests to fail.
2008-02-04 19:55:36 +01:00
unknown
ff8651c4ec Bug#21801 SQL exception handlers and warnings
The problem is that deprecated syntax warnings were not being
suppressed when the stored routine is being parsed for the first
execution. It's doesn't make sense to print out deprecated
syntax warnings when the routine is being executed because this
kind of warning only matters when the routine is being created.

The solution is to suppress deprecated syntax warnings when
parsing the stored routine for loading into the cache (might
mean that the routine is being executed for the first time).


mysql-test/r/sp-error.result:
  Add test case result for Bug#21801
mysql-test/t/sp-error.test:
  Add test case for Bug#21801
sql/sp.cc:
  Implement a internal error handler to catch deprecated
  syntax warnings when loading a stored procedure into the
  cache.
2008-02-04 16:39:55 -02:00
unknown
2849e6dfe7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  poseidon.ndb.mysql.com:/home/tomas/cge-5.1
2008-02-04 16:53:39 +01:00
unknown
0fe17ab3c0 Bug mysqld leak if doing multiple statements within same transaction (or wo/ trans)
- in autocommit do not allocate statistics share, but instead use one directly on the handler
2008-02-04 15:40:04 +01:00
unknown
d4e3ab9cf6 Merge riska.(none):/home/sven/bktip/5.1-new-rpl
into  riska.(none):/home/sven/bk/b34141-mysqlbinlog_4.1_binlogs/5.1-new-rpl


sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
2008-02-04 14:37:34 +01:00
unknown
41c186e9c3 Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb


storage/ndb/src/common/debugger/SignalLoggerManager.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Auto merged
storage/ndb/src/kernel/vm/pc.hpp:
  Auto merged
2008-02-04 14:36:54 +01:00
unknown
99f67290ad Fixing result change after merge.
mysql-test/suite/rpl/r/rpl_user.result:
  Result change.
2008-02-04 14:29:23 +01:00
unknown
b8c52ae394 ndb - some warnings, debug errors
ndb/src/common/debugger/SignalLoggerManager.cpp:
  some warnings, debug errors
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  some warnings, debug errors
ndb/src/kernel/vm/pc.hpp:
  some warnings, debug errors
2008-02-04 13:46:35 +01:00
unknown
5716a69961 Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/suite/rpl/r/rpl_user.result:
  Manual merge.
2008-02-04 13:23:20 +01:00
unknown
74bd1b0faf Updating result file.
mysql-test/r/rpl_user.result:
  Result change.
2008-02-04 13:19:29 +01:00
unknown
1bc4867d3b Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge
into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/suite/rpl/t/rpl_user.test:
  Manual merging.
2008-02-04 12:33:28 +01:00