Commit graph

57233 commits

Author SHA1 Message Date
Guilhem Bichot
a15d25f07e In maria_recovery.trace we can see the Query which generated this record, but this printed too much
(query is not 0-terminated in the log record): limit it to the true query's size.
2009-03-05 17:47:31 +01:00
Guilhem Bichot
8a715a5990 Fix for BUG#42180 "Maria: maria-recovery-bitmap.test fails repeatedly"
storage/maria/ma_loghandler.c:
  Normally, when we log LOGREC_LONG_TRANSACTION_ID, undo_lsn should be 0: assert this.
storage/maria/ma_test_force_start.pl:
  this script does not work with mtr2, make it use mtr1
storage/maria/trnman.c:
  The bug's cause was that: transaction would log LOGREC_LONG_TRANSACTION_ID, then Checkpoint would run
  and skip it (because its undo_lsn is still 0), then transaction would log REDO+UNDO, then crash. At Recovery,
  REDO phase would start from Checkpoint's record LSN, so wouldn't see LOGREC_LONG_TRANSACTION_ID, and
  as Checkpoint record does not mention transaction, transaction would be unknown, so its REDO+UNDO would
  be thrown away (assumed to belong to a transaction committed long ago as unknown), so transaction
  would not be rolled back, which is wrong. Fix is: it was wrong to skip a transaction if undo_lsn is 0;
  as soon as LOGREC_LONG_TRANSACTION_ID has been logged, it becomes potentially invisible to the REDO
  phase, and so we must include this transaction in the checkpoint record.
2009-03-05 14:46:45 +01:00
Guilhem Bichot
6a1bc662d6 the Maria testsuite needs to be in the tarball, to make pushbuild run it 2009-02-13 13:25:41 +01:00
Guilhem Bichot
b3ea683c38 merge from latest 5.1-maria 2009-02-12 22:12:32 +01:00
Guilhem Bichot
998b4ae52d Merge of MyISAM changes done in 5.1-main, into Maria 2009-02-12 18:51:00 +01:00
Guilhem Bichot
b90ff5340f Fixing problems of previous 5.1-main->5.1-maria merge:
- adding back Serg's "mtr --list-options"
- safe_mutex deadlock detector started raising wrong deadlock warnings, fixed
here by a backport from 6.0-main.

include/my_pthread.h:
  Porting changes done to 6.0-main which satisfy the safe_mutex deadlock detector (those
  in 5.1-main don't), see chad@mysql.com-20090126155607-n0j3zbmgbfepnmmo for explanations
mysql-test/mysql-test-run.pl:
  adding back Serg's --list-options
mysys/my_init.c:
  Porting changes done to 6.0-main which satisfy the safe_mutex deadlock detector (those
  in 5.1-main don't), see chad@mysql.com-20090126155607-n0j3zbmgbfepnmmo for explanations
mysys/my_thr_init.c:
  Porting changes done to 6.0-main which satisfy the safe_mutex deadlock detector (those
  in 5.1-main don't), see chad@mysql.com-20090126155607-n0j3zbmgbfepnmmo for explanations
2009-02-12 16:27:33 +01:00
Guilhem Bichot
704b4845aa merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.
There were so many changes into mtr (this is the new mtr coming) that I rather
copied mtr from 6.0-main here (at least this one knows how to run Maria tests).
I also fixed suite/maria tests to be accepted by the new mtr.

mysys/thr_mutex.c:
  adding DBUG_PRINT here, so that we can locate where the warning is issued.
2009-02-12 15:08:56 +01:00
Sergei Golubchik
ce8f55fe3b Bug#41092 Maria: timeout in waiting_threads-t
it was bug in a test program, changed WT_THD's initialization to ensure they have no garbage from the previous run.
2009-02-12 11:06:03 +01:00
Sergei Golubchik
b4d0bf1084 support for glob(7) patterns in dbug 2009-02-11 19:57:38 +01:00
Sergei Golubchik
2637dda668 merged 2009-02-10 19:49:36 +01:00
Sergei Golubchik
d5c0d25792 Bug#42735: dbug treated duplicate keywords (-#d,kw,kw) incorrectly 2009-02-10 19:13:24 +01:00
Guilhem Bichot
9653feb160 Callers of translog_deassign_id_from_share() need intern_lock.
Assert that keys don't point to bitmap pages.

storage/maria/ma_blockrec.h:
  assertion
storage/maria/ma_locking.c:
  With concurrent INSERTs, it is possible that two threads enter _ma_mark_file_changed()
  at the same time, so they should serialize their access to the "changed" state/share
  members; another reason is that this function may call _ma_update_state_lsns_sub()
  which may call translog_deassign_id_from_share() (I saw it during testing of
  online backup) which requires the intern_lock mutex.
  As INSERTs only change from "not changed" to "changed", we can first check without mutex:
  if it says "changed", some other thread has set or is setting the variables now,
  we don't need to do it; if it says "not changed", we serialize and re-check.
2009-02-09 22:52:42 +01:00
Guilhem Bichot
554eb6c2cf Comments. Take bitmap mutex lock when changing bitmap.changed.
storage/maria/ha_maria.cc:
  comment
storage/maria/ma_checkpoint.c:
  comment
storage/maria/ma_extra.c:
  use bitmap mutex when changing bitmap.changed, sounds safer
storage/maria/ma_pagecache.c:
  comment
storage/maria/ma_recovery.c:
  comments
2009-02-09 22:02:04 +01:00
Guilhem Bichot
790fbc566e merge with latest 5.1-maria 2009-02-09 18:22:50 +01:00
Sergei Golubchik
f0261aca0b Bug#42201 Maria: after a deadlock, table is marked as corrupted
don't treat deadlock or timeout as a sign of corruption
2009-02-06 22:14:13 +01:00
unknown
5564e53c42 merge 2009-02-06 00:38:30 +02:00
unknown
a9376429a6 merge 2009-02-04 10:51:17 +02:00
unknown
e844a5fd6d Storing information in newly started buffer added. 2009-02-04 10:13:10 +02:00
Georgi Kodinov
a5e5b0180a merged 5.0-bugteam -> 5.1-bugteam 2009-02-03 11:05:49 +02:00
Georgi Kodinov
83ff1b96fd changed the version in .bzr-mysql/default.conf 2009-02-03 11:04:22 +02:00
Patrick Crews
a07a7afefa merge 5.0 -> 5.1 2009-02-02 17:56:45 -05:00
Patrick Crews
9a3afd1a12 Bug#39369: execution of "variables.test" with "check-testcases" show differences.
The original symptoms of this bug have been fixed as a consequence of other bug fixes.
Taking this time to correct some formatting, such as replacing error numbers with names.
Beginning this with 5.0
2009-02-02 17:30:02 -05:00
Serge Kozlov
84a237b914 Bug#38603:
The patch adds restart of mysql server and replacing of binlog file 
when mysql server is stopped.
2009-02-03 00:26:49 +03:00
Andrei Elkin
d34ae8c724 Bug #41732 rpl_ndb_circular_2ch needs an updated configuration file
There are two issues: 
      1. 6.0 uses the obsolate master-*** server options;
      2. the test is not deterministic in that although master vs slave consistency is
         fine, two runs of the test can have different results. The reason of the
         non-determinism is the combination of 
         a chosen way to demo results and the ndb_autoincrement_prefetch_sz feature.

The current patch fixes the 2nd issue by putting out results via diff_table macro
instead of the former run-sensitive method.
The 1st issue is going to be fixed by a separate patch to 6.0.

mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_2ch.result:
  results changed
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_2ch.test:
  Test is refined to put out results via diff_table macro instead of the former run-sensitive
  method.
2009-02-02 22:31:01 +02:00
Tatiana A. Nurnberg
9186df2422 auto-merge 2009-02-02 14:37:30 +01:00
Alexander Barkov
9a64fc52af Bug#41084 full-text index added to custom UCA collation not working
Problem:
Custom UCA collations didn't set the MY_CS_STRNXFRM flag,
which resulted in "prefix_search" method instead of
the required "seq_search".

Problem2: (not metioned in the bug report)
Custom UCA collations didn't also set the MY_CS_UNICODE flag,
so an attempt to compare a column with a custom UCA collation
to another column with a non-Unicode character set led to
the "illegal mix of collation" error.

Fix:
the two missing flags was added into collation initialization.

  Upgrade:

  - All fulltext indexes with custom UCA collations should be rebuilt.

  - Non-fulltext custom UCA indexes should likely be rebuild as well.
2009-02-02 17:25:42 +04:00
Tatiana A. Nurnberg
a73d9f3f05 auto-merge 2009-02-02 14:10:35 +01:00
Serge Kozlov
da44c30130 post-merge push with patch for rpl_ndb_log 2009-02-02 15:06:40 +03:00
Serge Kozlov
56fa095907 Post-merge patch for extra/rpl_test/rpl_log.test:
Remove size of binlog file from SHOW BINARY LOGS. 
Changing size of binlog file is an affect of adding or removing events to/from
binlog and it can be checked in next command of test: SHOW BINLOG EVENTS.
For SHOW BINARY LOGS statement enough to show the list of file names.
2009-02-02 14:44:18 +03:00
Georgi Kodinov
8fe7b7effd fixed system_mysql_db_fix30020 test faiilure
fixed federated warnings
2009-02-02 13:36:03 +02:00
Sergey Glukhov
c08fe02122 automerge 2009-02-02 15:09:04 +04:00
Bjorn Munch
9128d3b7b0 merge 2009-02-02 11:43:06 +01:00
Sergey Glukhov
921a4e5eb5 fixed jp test failures
mysql-test/suite/jp/r/jp_create_db_sjis.result:
  hide mtr database
mysql-test/suite/jp/r/jp_create_db_ucs2.result:
  hide mtr database
mysql-test/suite/jp/r/jp_create_db_ujis.result:
  hide mtr database
mysql-test/suite/jp/r/jp_create_db_utf8.result:
  hide mtr database
mysql-test/suite/jp/t/jp_create_db_sjis.test:
  hide mtr database
mysql-test/suite/jp/t/jp_create_db_ucs2.test:
  hide mtr database
mysql-test/suite/jp/t/jp_create_db_ujis.test:
  hide mtr database
mysql-test/suite/jp/t/jp_create_db_utf8.test:
  hide mtr database
2009-02-02 14:42:33 +04:00
Bjorn Munch
d3f4c75e55 Bug #42535 MTR2 output format for skipped tests should be identical to MTR 1
Changed [ skip ] to [ skipped ] and removed optional .
2009-02-02 11:26:19 +01:00
Georgi Kodinov
c205bef39d Fix from magnus for the "The socket file path is too long (> 107)" failure. 2009-02-02 12:18:38 +02:00
Alfranio Correia
19e28b3792 Merge PB2 MTR2 comment integration fix, from 5.1-rpl-merge tree. 2009-02-01 19:15:58 +00:00
Alfranio Correia
1021520512 Fixed test cases in suite funcs_1 due to changes in the MTR "check test cases". 2009-02-01 19:10:36 +00:00
Alfranio Correia
49ac0193c4 merge 5.1-bugteam --> 5.1-bugteam (local) 2009-02-01 17:24:07 +00:00
Luis Soares
f59e76e2d8 Empty commit to force new run on PB2 with MTR2 and comment fix. 2009-02-01 18:22:09 +01:00
Alfranio Correia
5afd989555 Several fixes in funcs_1 suite:
1 - MASTER_MYSOCK fixed inexistent environment variable.
  2 - Fixed mismatch in result files due to changes in MTR.
2009-02-01 17:15:58 +00:00
Georgi Kodinov
e6b19aa0fa added a missing test directory in Makefile.am 2009-02-01 17:01:41 +02:00
Luis Soares
0030ff1457 BUG#42485: Pushbuild2 and some build tools do not work together with MTR2
It seems that the length of the thick line printed by mtr when printing the 
suite name differs from mtr1 and mtr2, affecting the mtr filtering by PB2.
      
This patch addresses it by restoring the thick line length to 78 (original
length) instead of 60 (the one in mtr2).
2009-02-01 14:14:39 +01:00
Georgi Kodinov
6a4f8a8d2a Fixed the parts testsuite to work with mtr2 2009-02-01 14:00:48 +02:00
Georgi Kodinov
299339d41a Fixed internal test check warnings in 5.1-bugteam. 2009-02-01 11:18:09 +02:00
Michael Widenius
f0da84c3a8 Fixes Bug #40711 "Maria crash in my_no_flags_free"
storage/maria/ma_close.c:
  Reset state_history when closing file.
  This fixes a race condition when the checkpoint is using the file while the file is beeing closed.
  The bug was that checkpoint was accessing the freed state_history.
2009-02-01 09:29:56 +02:00
Davi Arnaut
c0ae6f6d86 Remove duplicated test for Bug#34517
mysql-test/r/change_user.result:
  Update test case result.
mysql-test/r/not_embedded_server.result:
  Update test case result.
mysql-test/t/change_user.test:
  Move newer (and better) version of the test case.
mysql-test/t/not_embedded_server.test:
  Move this test case over to change_user.test
  This version is deterministic.
2009-01-31 22:04:57 -02:00
Luis Soares
eb749275f8 BUG#35583: mysqlbinlog replay fails with ERROR 1146 when temp tables are used
The test case proposed by the bugfix fails in bugteam trees after merging new 
mtr from main. The failure is due to the fact that the binlog file location has
changed and is no more under $MYSQLTEST_VARDIR/log.
      
This patch fixes the test failure by setting the correct path to the binlog 
file.
2009-01-31 22:47:50 +01:00
Davi Arnaut
c5b3125f00 Rename std_data_ln to std_data. 2009-01-31 17:22:59 -02:00
Davi Arnaut
234e8133d3 Fix test cases to preserve the state that existed before the
test case was executed.

mysql-test/include/concurrent.inc:
  Drop created user.
mysql-test/r/concurrent_innodb_safelog.result:
  Update test case result.
mysql-test/r/concurrent_innodb_unsafelog.result:
  Update test case result.
2009-01-31 16:09:41 -02:00
Davi Arnaut
7981a859f9 Post-merge fix for Bug#36326
mysql-test/r/cache_innodb.result:
  Update test case result.
2009-01-31 15:55:06 -02:00