Commit graph

23566 commits

Author SHA1 Message Date
Sergey Vojtovich
1ab3b31ff6 Merge 5.0-bugteam -> 5.1-bugteam. 2009-02-04 17:00:40 +04:00
Matthias Leich
9da593de5e Automatic merge, no conflicts 2009-02-04 14:20:05 +01:00
Magnus Svensson
5d130827f6 Merge 2009-02-04 13:29:46 +01:00
Matthias Leich
aa930f78e5 Merge last changesets, no conflicts 2009-02-04 13:10:33 +01:00
Sergey Vojtovich
8745e368b7 BUG#32047 - 'Spurious' errors while opening MERGE tables
Accessing well defined MERGE table may return an error
stating that the merge table is incorrectly defined. This
happens if MERGE child tables were accessed before and we
failed to open another incorrectly defined MERGE table in
this connection.

myrg_open() internally used my_errno as a variable for determining
failure, and thus could be tricked into a wrong decision by other
uses of my_errno.

With this fix we use function local boolean flag instead of my_errno
to determine failure.
2009-02-04 15:46:23 +04:00
Sergey Glukhov
9ab3654530 Bug#42495 updatexml: Assertion failed: xpath->context, file .\item_xmlfunc.cc, line 2507
Problem:
   RelativeLocationPath can appear only after a node-set expression
   in the third and the fourth branches of this rule:
     PathExpr :: =  LocationPath
                    | FilterExpr
                    | FilterExpr '/' RelativeLocationPath
                    | FilterExpr '//' RelativeLocationPath
   XPatch code didn't check the type of FilterExpr and crashed.
Fix:
   If FilterExpr is a scalar expression
   (variable reference, literal, number, scalar function call)
   return error.
2009-02-04 15:40:12 +04:00
Davi Arnaut
7aec6cceca Merge from upstream 5.1-bugteam 2009-02-04 09:16:43 -02:00
Matthias Leich
2e36bc3d72 Merge of latest changesets into GCA tree 2009-02-04 12:07:52 +01:00
Andrei Elkin
da01f3846b Bug #41183 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.
2009-02-04 12:13:54 +02:00
Magnus Svensson
15dc0c2a74 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
Alexey Kopytov
887d1493fa Fix for bug #41868: 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.
2009-02-03 20:19:01 +03:00
Davi Arnaut
bc03c9ef19 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.
2009-02-03 15:16:24 -02:00
Matthias Leich
449bfbd7fa Merge 5.0 -> 5.1
+ fix wrong resultfile have_outfile.require
2009-02-03 14:45:17 +01:00
Patrick Crews
6fb2ba1c3d merge 5.0 -> 5.1 2009-02-02 17:56:45 -05:00
Patrick Crews
ed5ee58bfc 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
36b12d8843 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
7da691c9f8 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
176a788105 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.
2009-02-02 22:31:01 +02:00
Tatiana A. Nurnberg
5622d4261f Bug#33550: mysqldump 4.0 compatibility broken
mysqldump included character_set_client magic
that is unknown before 4.1 even when asked for
an appropriate compatibility mode.

In compatibility (3.23, 4.0) mode, we do not
output charset statements (not even in a
"comment conditional"), nor do we do magic on
the server, even if the server is sufficient
new (4.1+). Table-names will be output converted
to the charset requested by mysqldump; if such
a conversion is not possible (Ivrit -> Latin),
mysqldump will fail.
2009-02-02 18:19:07 +01:00
Tatiana A. Nurnberg
ba1b30ab66 auto-merge 2009-02-02 14:37:30 +01:00
Alexander Barkov
a491bcc4e5 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
337bf31e9f auto-merge 2009-02-02 14:10:35 +01:00
Serge Kozlov
b6542a374b post-merge push with patch for rpl_ndb_log 2009-02-02 15:06:40 +03:00
Serge Kozlov
01e368d1f6 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
7ee8ac6dbd fixed system_mysql_db_fix30020 test faiilure
fixed federated warnings
2009-02-02 13:36:03 +02:00
Sergey Glukhov
f21af1060e automerge 2009-02-02 15:09:04 +04:00
Bjorn Munch
8ad44e4b91 merge 2009-02-02 11:43:06 +01:00
Sergey Glukhov
ef3060e083 fixed jp test failures 2009-02-02 14:42:33 +04:00
Bjorn Munch
29fa37a1c5 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
fb9ab04078 Fix from magnus for the "The socket file path is too long (> 107)" failure. 2009-02-02 12:18:38 +02:00
Alfranio Correia
db78d337b5 Merge PB2 MTR2 comment integration fix, from 5.1-rpl-merge tree. 2009-02-01 19:15:58 +00:00
Alfranio Correia
88063f4d66 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
20c8187fad merge 5.1-bugteam --> 5.1-bugteam (local) 2009-02-01 17:24:07 +00:00
Alfranio Correia
c763a17461 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
8dd6a62c4e added a missing test directory in Makefile.am 2009-02-01 17:01:41 +02:00
Luis Soares
bb61c498ba 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
f5df2d9ce9 Fixed the parts testsuite to work with mtr2 2009-02-01 14:00:48 +02:00
Georgi Kodinov
aea9bcaa40 Fixed internal test check warnings in 5.1-bugteam. 2009-02-01 11:18:09 +02:00
Davi Arnaut
26e8675889 Remove duplicated test for Bug#34517 2009-01-31 22:04:57 -02:00
Luis Soares
91ac2afa6f 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
fac5865a3d Rename std_data_ln to std_data. 2009-01-31 17:22:59 -02:00
Davi Arnaut
4157d0ca3b Fix test cases to preserve the state that existed before the
test case was executed.
2009-01-31 16:09:41 -02:00
Davi Arnaut
36f8554e44 Post-merge fix for Bug#36326 2009-01-31 15:55:06 -02:00
Davi Arnaut
68da0130a9 Fix test cases to preserve the state that existed before the
test case was executed.
2009-01-31 14:10:43 -02:00
Georgi Kodinov
ece2f23aea fixed some parts test suite bugs 2009-01-31 17:47:35 +02:00
Georgi Kodinov
4b35af07f4 automatically merged 2009-01-31 14:18:03 +02:00
Georgi Kodinov
2b3a53a352 fixed bad merge of 5.1-main -> 5.1-bugteam 2009-01-31 14:15:49 +02:00
Tatiana A. Nurnberg
db39a76696 auto-merge 2009-01-31 02:08:41 +01:00
Tatiana A. Nurnberg
d36d50f414 auto-merge 2009-01-31 02:07:36 +01:00
Horst Hunger
690dc721b8 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