Commit graph

56393 commits

Author SHA1 Message Date
Matthias Leich
da304a175e Merge of latest changesets into GCA tree 2009-02-04 12:07:52 +01:00
Andrei Elkin
9b11bc02ae Bug rpl_ndb_circular, rpl_ndb_circular_simplex need maintenance, crash
The bug happened because filtering-out a STMT_END_F-flagged event so that
the transaction COMMIT finds traces of incomplete statement commit.
Such situation is only possible with ndb circular replication. The filtered-out
rows event is one that immediately preceeds the COMMIT query event.
      
Fixed with deploying an the rows-log-event statement commit at executing
of the transaction COMMIT event. 
Resources that were allocated by other than STMT_END_F-flagged event of
the last statement are clean up prior execution of the commit logics.


mysql-test/suite/rpl_ndb/t/disabled.def:
  re-enabling two tests.
sql/log_event.cc:
  Adding the statement cleanup to execute at the transaction commit time.
  The statement might not be ended with execution of STMT_END_F-flagged event because of
  the event was filtered out by SERVER_ID rules.
  Small refactoring for Rows_log_event::do_update_pos() to be split on two parts:
  the statement commit that releases its execution time allocated resources, and
  the relay log update.
2009-02-04 12:13:54 +02:00
Magnus Svensson
4561831bf7 Bug#42588 system_mysql_db_fix30020 fails when run from bin dist with mtr2
- Properly set --bindir=$path_client_bindir and --basedir=$basedir by adding %s format specifier
2009-02-04 10:49:52 +01:00
Timothy Smith
04fdb65c97 Merge up from 5.0-build 2009-02-04 04:54:05 +01:00
Timothy Smith
1b557a2ce7 The nwbootstrap script depended on BitKeeper, and was fairly complicated. It's much
simpler to just use the source .tar.gz to do a build.  So the script has been renamed
to nwbuild, and simplified.
2009-02-04 04:20:42 +01:00
Alexey Kopytov
dfbba6e7fd Fix for bug : crash or memory overrun with concat + upper, date_format
functions
      
String::realloc() did not check whether the existing string data fits in the newly
allocated buffer for cases when reallocating a String object with external buffer
(i.e.alloced == FALSE).  This could lead to memory overruns in some cases.


mysql-test/r/func_str.result:
  Added a test case for bug .
mysql-test/t/func_str.test:
  Added a test case for bug .
sql/sql_class.cc:
  After each call to Item::send() in select_send::send_data() reset buffer to its
  original state to reduce unnecessary malloc() calls. See comments for bug 
  for detailed analysis.
sql/sql_string.cc:
  Fixed String::realloc() to check whether the existing string data fits in the newly allocated buffer for cases when reallocating a String object with external buffer.
2009-02-03 20:19:01 +03:00
Davi Arnaut
c9dc936a2b Bug#40536: SELECT is blocked by INSERT DELAYED waiting on
upgrading lock, even with low_priority_updates

The problem is that there is no mechanism to control whether a
delayed insert takes a high or low priority lock on a table.

The solution is to modify the delayed insert thread ("handler")
to take into account the global value of low_priority_updates
when taking table locks. The value of low_priority_updates is
retrieved when the insert delayed thread is created and will
remain the same for the duration of the thread.


include/thr_lock.h:
  Update prototype.
mysql-test/r/delayed.result:
  Add test case result for Bug#40536
mysql-test/t/delayed.test:
  Add test case for Bug#40536
mysys/thr_lock.c:
  Add function parameter which specifies the write lock type.
sql/sql_insert.cc:
  Take a low priority write lock if global value of low_priority_updates
  was ON when the thread was created.
2009-02-03 15:16:24 -02:00
Matthias Leich
99685a0b79 Merge 5.0 -> 5.1
+ fix wrong resultfile have_outfile.require
2009-02-03 14:45:17 +01:00
Staale Smedseng
40eec6c544 Bug opt_threads option is not used anywhere at all
Option opt_threads is deprecated in 5.1, and a warning is
printed when used. Will remove in 6.0.
2009-02-03 13:46:25 +01:00
Alfranio Correia
c29994edb1 BUG#42445 Warning messages in innobase/handler/ha_innodb.cc
There was a type casting problem in the storage/innobase/handler/ha_innodb.cc,
(int ha_innobase::write_row(...)). Innobase uses has an internal error variable
of type 'ulint' while mysql uses an 'int'. 
      
To fix the problem the function manipulates an error variable of
type 'ulint' and only casts it into 'int' when needs to return the value.
2009-02-03 11:36:46 +00: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
Matthias Leich
1a04fc03fe 1. Slice of fix for Bug#42003 tests missing the disconnect of connections <> default
- If missing: add "disconnect <session>"
   - If physical disconnect of non "default" sessions is not finished
     at test end: add routine which waits till this happened
+ additional improvements like
  - remove superfluous files created by the test
  - replace error numbers by error names
  - remove trailing spaces, replace tabs by spaces
  - unify writing of bugs within comments
  - correct comments
  - minor changes of formatting
Modifications according to the code review are included.
Fixed tests:
grant2
grant3
lock_tables_lost_commit
mysqldump
openssl_1
outfile
2009-02-02 22:20:25 +01:00
Andrei Elkin
d34ae8c724 Bug 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 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
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
Davi Arnaut
050cf69f11 Fix test cases to preserve the state that existed before the
test case was executed.

mysql-test/r/func_compress.result:
  Update test case result.
mysql-test/r/innodb_bug34300.result:
  Update test case result.
mysql-test/t/func_compress.test:
  Disconnect connection and reset max_allowed_packet to it's
  default value.
mysql-test/t/innodb_bug34300.test:
  Disconnect connection and reset max_allowed_packet to it's
  default value and enable query log.
2009-01-31 14:10:43 -02:00
Georgi Kodinov
6024134105 fixed some parts test suite bugs 2009-01-31 17:47:35 +02:00
Georgi Kodinov
7f18226894 automatically merged 2009-01-31 14:18:03 +02:00
Georgi Kodinov
880a4583a6 fixed bad merge of 5.1-main -> 5.1-bugteam 2009-01-31 14:15:49 +02:00
Tatiana A. Nurnberg
2f47c306dd auto-merge 2009-01-31 02:08:41 +01:00
Tatiana A. Nurnberg
518cfea483 auto-merge 2009-01-31 02:07:36 +01:00
Horst Hunger
6cfd0f2593 Fix for bug#39382 including review results after pulling the bugteam tree now using the new mtr. 2009-01-30 17:59:10 +01:00
Tatiana A. Nurnberg
ce563480b7 Bug#41370: TIMESTAMP field does not accepts NULL from FROM_UNIXTIME()
When storing a NULL to a TIMESTAMP NOT NULL DEFAULT ...,
NULL returned from some functions threw a 'cannot be NULL error.'

NULL-returns now correctly result in the timestamp-field being
assigned its default value.

mysql-test/r/type_timestamp.result:
  Show that for TIMESTAMP NOT NULL DEFAULT, NULL function returns
  set default now.
mysql-test/t/type_timestamp.test:
  Show that for TIMESTAMP NOT NULL DEFAULT, NULL function returns
  set default now.
sql/item.cc:
  When storing a returned NULL (from a time- or date-related
  function), make sure to apply NULL-means-DEFAULT magic where
  applicable.
2009-01-30 17:12:24 +01:00