Commit graph

53037 commits

Author SHA1 Message Date
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 #34305 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 #34275 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
6210278628 Bug#33329 extraneous ROLLBACK in binlog on connection
does not use trans tables

There had been two issues.
Rollback statement was recorded in binlog even though a multi-update
had not modified any non-transactional table.
The reason for this artifact was a false initial value of multi_update::transactional_tables.
Yet another artifact that explained on the bug page is that 
`ha_autocommit_or_rollback' works differently depending on whether
a transaction engine has been compiled in. 

Fixed: with setting multi_update::transactional_tables to zero at initialization
time. Multi-update on non-trans table won't cause ROLLBACK in binlog with
either compilation option.

The 2nd mentioned artifact comprises a self-standing issue (to be reported
separately).


mysql-test/r/multi_update.result:
  results changed - there is no ROLLBACK in binlog anymore as it should be
sql/sql_update.cc:
  A wrong assumption on that there were modified transactional table,
  which is nonsense at the very beginning of the query execution.
2008-02-04 16:37:41 +02:00
unknown
77b84b12e6 Bug #32790 crash in trigger.test with InnoDB for a table
the reason for the failure were incorrect asserts.

Removing asserts altogether as there is no the implication does not hold
(as explained in the comments for the file).


sql/sql_delete.cc:
  removing two asserts because they can not hold basing on the definition
  of `normal_tables'. The one does not specify in a non-transactional table,
  which must be in the list of tables to be deleted, is modified indeed.
  So, it's possible to have normal_tables == true and deleted == true both
  but that would be yet a transactional table got modified (and then
  thd->transaction.stmt.modified_non_trans_table remains false default).
2008-02-04 16:35:41 +02: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
unknown
86260ead5a Fixes to make rpl_user test pass in pushbuild.
mysql-test/t/rpl_user.test:
  Removing redundant reset master and deleting users from master
  and slave without using binary log.
2008-02-04 12:22:37 +01:00
unknown
4a52cbaa2e More fixes to remove test failures in pushbuild.
mysql-test/suite/rpl/r/rpl_row_trig001.result:
  Result change.
mysql-test/suite/rpl/t/rpl_row_trig001.test:
  Correcting a typo and trying to avoid a race condition when
  dumping the contents of the master and slave for comparison.
2008-02-04 12:12:03 +01:00
unknown
2895760572 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/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
2008-02-04 12:05:23 +01:00
unknown
73c8328f20 bug#34169 - fix pthread_t abuse
ndb/src/ndbapi/Ndb.cpp:
  fix pthread_t abuse
ndb/test/ndbapi/testOIBasic.cpp:
  fix pthread_t abuse
2008-02-04 09:23:56 +01:00
unknown
b14b7fc3d7 Yet more changes to fix the merge clone.
mysql-test/suite/rpl/t/rpl_idempotency.test:
  Adding "have_innodb.inc" since the test reqires InnoDB.
2008-02-04 08:43:22 +01:00
unknown
f792cf3e38 Bug#32510 LIKE search fails with indexed 'eucjpms' and 'ujis' char column
Problem: some collation handlers called incorrect version
of my_like_range_xxx(), which led to wrong min_str and max_str,
so like range optimizer threw away good records.
Fix: changing the wrong handlers to call proper version of
my_like_range_xxx().


mysql-test/r/ctype_big5.result:
  Adding test
mysql-test/r/ctype_cp932.result:
  Adding test
mysql-test/r/ctype_eucjpms.result:
  Adding test
mysql-test/r/ctype_euckr.result:
  Adding test
mysql-test/r/ctype_gb2312.result:
  Adding test
mysql-test/r/ctype_gbk.result:
  Adding test
mysql-test/r/ctype_sjis.result:
  Adding test
mysql-test/r/ctype_uca.result:
  Adding test
mysql-test/r/ctype_ucs.result:
  Adding test
mysql-test/r/ctype_ujis.result:
  Adding test
mysql-test/t/ctype_big5.test:
  Adding test
mysql-test/t/ctype_cp932.test:
  Adding test
mysql-test/t/ctype_eucjpms.test:
  Adding test
mysql-test/t/ctype_euckr.test:
  Adding test
mysql-test/t/ctype_gb2312.test:
  Adding test
mysql-test/t/ctype_gbk.test:
  Adding test
mysql-test/t/ctype_sjis.test:
  Adding test
mysql-test/t/ctype_uca.test:
  Adding test
mysql-test/t/ctype_ucs.test:
  Adding test
mysql-test/t/ctype_ujis.test:
  Adding test
strings/ctype-euc_kr.c:
  Changing like_range function
strings/ctype-eucjpms.c:
  Changing like_range function
strings/ctype-gb2312.c:
  Changing like_range function
strings/ctype-ucs2.c:
  Changing like_range function
strings/ctype-ujis.c:
  Changing like_range function
mysql-test/include/ctype_like_range_f1f2.inc:
  New BitKeeper file ``mysql-test/include/ctype_like_range_f1f2.inc''
2008-02-04 11:10:40 +04:00
unknown
2bccc0e600 Masking out some more errors and warnings that are benign.
mysql-test/include/delete_anonymous_users.inc:
  Disabling warnings.
mysql-test/lib/mtr_report.pl:
  Masking out benign errors and warnings from var/log/warnings file.
2008-02-04 07:15:14 +01:00
unknown
0780f0bf98 Minor fix to make rpl_loaddata_map pass without warnings.
mysql-test/suite/rpl/t/rpl_loaddata_map-master.opt:
  Correcting read_buffer_size to be a multiple of 4KiB since a
  warning is generated otherwise.
2008-02-04 06:49:15 +01:00
unknown
f01ed1196c ndb - bug#33619
make sure to alloc logspace and set bits
  if doing delete after previous update wo/ touching DD part


mysql-test/suite/ndb/r/ndb_dd_basic.result:
  testcase
mysql-test/suite/ndb/t/ndb_dd_basic.test:
  testcase
2008-02-03 21:24:59 +01:00
unknown
eca6968963 Removing expected errors from slave from the warnings file.
mysql-test/lib/mtr_report.pl:
  Removing some expected warnings and errors from the slave for
  tests rpl_idempotency and rpl_skip_error.
2008-02-03 18:43:05 +01:00
unknown
6bb77bf6bb Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
2008-02-03 14:14:32 +01:00
unknown
0f88379324 ndb - bug#34260
remove incorrect ndbrequire
2008-02-03 14:01:31 +01:00
unknown
5d66c3565a Bug #34244 Test ndb_binlog_log_bin fails for 'drop table if
exists t1,t2,t3'
Bug #34245 Test ndb_binlog_multi fails for 'CREATE TABLE'
Bug #34246 Test rpl_ndb_transaction fails with 'Failed to create
           'mysql/ndb_apply_status'

Tests cases didn't wait for cluster to come up due to a typo
in have_multi_ndb.inc.


mysql-test/include/have_multi_ndb.inc:
  SHOW TABLES is case-sensitive in the pattern to LIKE.
mysql-test/suite/ndb/t/disabled.def:
  Enabling tests.
mysql-test/suite/rpl_ndb/t/rpl_ndb_transaction.test:
  Adding include of have_debug since test requires that.
sql/sql_repl.cc:
  Replacing 'return' with 'DBUG_RETURN' in debug-traced function.
2008-02-03 11:48:45 +01:00
unknown
29245b9337 Disabling various tests and reporting bugs for them.
mysql-test/suite/ndb/t/disabled.def:
  Disabling tests ndb_binlog_lob_bin, ndb_binlog_multi,
  and rpl_ndb_transaction.
mysql-test/suite/parts/t/disabled.def:
  Disabling various partition tests.
2008-02-02 08:15:36 +01:00
unknown
0d2be94e60 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  mysql.com:/usr/clones/mysql-5.1-new-ndb2
2008-02-01 13:51:55 -06:00
unknown
c2505873d8 NdbRepStress.cpp:
Updated with new support function from Magnus push to dbutil


storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp:
  Updated with new support function from Magnus push to dbutil
2008-02-01 13:51:04 -06:00