Commit graph

56232 commits

Author SHA1 Message Date
Georgi Kodinov
83c5317a7f merged 5.0-bugteam -> 5.1-bugteam 2009-01-30 15:57:02 +02:00
Georgi Kodinov
87eb2cb938 merged 5.1-main -> 5.1-bugteam 2009-01-30 15:44:49 +02:00
Georgi Kodinov
bb31fd5992 merged 5.0-main -> 5.0-bugteam 2009-01-30 13:21:53 +02:00
Joerg Bruehe
d20a0bd43a Raise the version number in this (enterprise) tree, 5.0.77 will be a community build. 2009-01-29 22:43:52 +01:00
Luis Soares
f7a24d72dc merge: 5.1 -> 5.1-rpl-merge
conflicts:
  Text conflict in mysql-test/suite/sys_vars/r/rpl_max_binlog_size_func.result
  Text conflict in mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func.test
2009-01-29 17:59:46 +01:00
Luis Soares
d41cae03d7 merge: 5.1-rpl -> 5.1-rpl-merge 2009-01-29 17:25:54 +01:00
Magnus Svensson
9cd9aacb86 Merge 2009-01-29 15:39:00 +01:00
Magnus Svensson
d9cde17079 Bug#39849 ndb tests fail sporadically on pushbuild: "out of connection objects"
- Increase number of transaction objects available in ndbd
 - Most likely this is a timing related issue.
2009-01-29 15:22:02 +01:00
Andrei Elkin
093a6dd90e bug #42451 setup_fake_relay_log makes an incorrect path on windows
Temporarily blocking to run the test on windows.

Todo: remove the include upon setup_fake_relay_log has been fixed.


mysql-test/suite/rpl/t/rpl_cross_version.test:
  blocking to run the test on windows for a while.
2009-01-29 15:54:58 +02:00
Alfranio Correia
0c7143b8cc Re-enabled log_bin_trust_function_creators_func as the patch in
BUG#41003 reached our trees.
2009-01-29 13:29:19 +00:00
Georgi Kodinov
b1b2565a6a null merged the fix for bug 35396 to 5.1-bugteam 2009-01-29 14:49:35 +02:00
Georgi Kodinov
b367d2fd1f merged 35396 to 5.0-bugteam 2009-01-29 14:45:24 +02:00
Georgi Kodinov
37e88536e3 Bug #35396: Abnormal query times in slow query log
If the system time is adjusted back during a query execution
(resulting in the end time being earlier than the start time)
the code that prints to the slow query log gets confused and 
prints unsigned negative numbers.
            
Fixed by not logging the statements that would have negative
execution time due to time shifts.
No test case since this would involve changing the system time.

sql/sql_parse.cc:
  Bug #35396: don't log queries with negative execution times 
  (due to shifts in system time).
2009-01-29 14:40:48 +02:00
Satya B
f972ba14c2 merge to the latest 5.1-bugteam branch 2009-01-29 17:41:32 +05:30
Satya B
4a657eee92 An addition to BUG#39886 - Table full for MEMORY table is not written into error log
After the earlier fix, mtr tests reports "table full" messages as warnings. This is 
expected, this patch fixes the mtr testframework to ignore the error message.

mysql-test/lib/mtr_report.pl:
  fixed mtr_report_stats to ignore the Table Full error messages generated by the testcases main.almost_full, main.myisam_data_pointer_size_func
2009-01-29 17:30:32 +05:30
Alfranio Correia
ba4a5e8c3c merge 5.1-bugteam --> 5.1-bugteam (local) 2009-01-29 11:30:02 +00:00
Sergey Petrunia
2cb3874a5a Fix trivial merge error 2009-01-29 11:47:20 +03:00
Sergey Petrunia
8731a7c276 Merge 2009-01-28 22:21:14 +03:00
Sergey Petrunia
a9608b196d BUG#37822: Correlated subquery with IN and IS UNKNOWN provides wrong result
Item_in_optimizer::is_null() evaluated "NULL IN (SELECT ...)" to NULL regardless of
whether subquery produced any records, this was a documented limitation.

The limitation has been removed (see bugs 8804, 24085, 24127) now
Item_in_optimizer::val_int() correctly handles all cases with NULLs. Make
Item_in_optimizer::is_null() invoke val_int() to return correct values for
"NULL IN (SELECT ...)".


mysql-test/r/subselect.result:
  BUG#37822: Correlated subquery with IN and IS UNKNOWN provides wrong result
  - Testcase
mysql-test/t/subselect.test:
  BUG#37822: Correlated subquery with IN and IS UNKNOWN provides wrong result
  - Testcase
2009-01-28 22:18:27 +03:00
Gleb Shchepa
b135bcabe5 automerge 5.0-bugteam --> 5.1-bugteam (bug 39069) 2009-01-28 22:48:41 +04:00
Gleb Shchepa
334e249f91 Bug #39069: <row constructor> IN <table-subquery> seriously
messed up

"ROW(...) IN (SELECT ... FROM DUAL)" always returned TRUE.

Item_in_subselect::row_value_transformer rewrites "ROW(...)
IN SELECT" conditions into the "EXISTS (SELECT ... HAVING ...)"
form.
For a subquery from the DUAL pseudotable resulting HAVING
condition is an expression on constant values, so further
transformation with optimize_cond() eliminates this HAVING
condition and resets JOIN::having to NULL.
Then JOIN::exec treated that NULL as an always-true-HAVING
and that caused a bug.

To distinguish an optimized out "HAVING TRUE" clause from
"HAVING FALSE" we already have the JOIN::having_value flag.
However, JOIN::exec() ignored JOIN::having_value as described
above as if it always set to COND_TRUE.

The JOIN::exec method has been modified to take into account
the value of the JOIN::having_value field.


mysql-test/r/subselect3.result:
  Added test case for bug #39069.
mysql-test/t/subselect3.test:
  Added test case for bug #39069.
sql/sql_select.cc:
  Bug #39069: <row constructor> IN <table-subquery> seriously
              messed up
  
  The JOIN::exec method has been modified to take into account
  the value of the JOIN::having_value field.
2009-01-28 22:46:45 +04:00
Davi Arnaut
a931ac090d Merge from 5.0-bugteam 2009-01-28 15:42:20 -02:00
Magnus Svensson
87bbeddbab Merge 2009-01-28 17:48:10 +01:00
Magnus Svensson
818557b2dd WL#4189 mtr.pl v2
- Fix faulty regex used for filtering out suspicious warnings, causing
   warnings/errors from previous tests to be reported
2009-01-28 17:46:00 +01:00
Davi Arnaut
aa0641dcf6 Remove test case for bug 40264.
Dirty close tricky does not work on Windows.

mysql-test/r/query_cache_notembedded.result:
  Remove test case result.
mysql-test/t/query_cache_notembedded.test:
  Remove test case.
2009-01-28 14:33:33 -02:00
Luis Soares
a95e5e0124 Disabled test main.innodb_bug39438:
BUG#42383 2009-01-28 lsoares 
"This fails in embedded and on windows. Note that this test is not run 
on windows and on embedded in PB for main trees currently"
2009-01-28 16:28:09 +01:00
Georgi Kodinov
5e84d00a25 merged bug 42366 to 5.1-bugteam 2009-01-28 17:00:28 +02:00
Alfranio Correia
23d032c34e BUG#35583 mysqlbinlog replay fails with ERROR 1146 when temp tables are used
When using CREATE TEMPORARY TABLE LIKE to create a temporary table, 
or using TRUNCATE to delete all rows of a temporary table, they 
did not set the tmp_table_used flag, and cause the omission of
"SET @@session.pseudo_thread_id" when dumping binlog with mysqlbinlog,
and cause error when replay the statements.
      
This patch fixed the problem by setting tmp_table_used in these two
cases. (Done by He Zhenxing 2009-01-12)


mysql-test/suite/binlog/r/binlog_tmp_table.result:
  Add test case for BUG#35583
mysql-test/suite/binlog/t/binlog_tmp_table.test:
  Add test case for BUG#35583
sql/sql_delete.cc:
  set thd->tmp_table_used when truncate temporary table
sql/sql_table.cc:
  set thd->tmp_table_used when using create like to create temporary tables
2009-01-28 14:35:12 +00:00
Georgi Kodinov
06e185280a Bug #42366: server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT"
Re-generated the PKI files needed.
Removed the ones that are not needed.
Updated the tests to reference the correct SSL subject.

mysql-test/r/openssl_1.result:
  Bug #42366: Updated the tests to reference the correct SSL subject
mysql-test/std_data/cacert.pem:
  Bug #42366: Re-generated the PKI files needed.
mysql-test/std_data/client-cert.pem:
  Bug #42366: Re-generated the PKI files needed.
mysql-test/std_data/client-key.pem:
  Bug #42366: Re-generated the PKI files needed.
mysql-test/std_data/server-cert-des.pem:
  Bug #42366: Removed the ones that are not needed.
mysql-test/std_data/server-cert.pem:
  Bug #42366: Re-generated the PKI files needed.
mysql-test/std_data/server-key-des.pem:
  Bug #42366: Removed the ones that are not needed.
mysql-test/std_data/server-key.pem:
  Bug #42366: Re-generated the PKI files needed.
mysql-test/std_data/server8k-cert.pem:
  Bug #42366: Re-generated the PKI files needed.
mysql-test/std_data/server8k-key.pem:
  Bug #42366: Re-generated the PKI files needed.
mysql-test/t/openssl_1.test:
  Bug #42366: Updated the tests to reference the correct SSL subject
2009-01-28 16:18:50 +02:00
Bjorn Munch
e9b36512ce merge 2009-01-28 14:44:22 +01:00
Bjorn Munch
36118ca6a1 Bug #42216 mysqltest: Use of diff belonging to current OS, with wrong option for Solaris
Check for existence of diff fails on Solaris due to unsupported "-v"
Fix is to do this check only on Windows where it was needed
2009-01-28 14:14:05 +01:00
Satya B
fe75e52c25 Fix for BUG#39886 - Table full for MEMORY table is not written into error log
When a MEMORY table is full the error is returned to client but not written
to error log.

Fixed the handler api to write the error mesage to error log when the table is
full.

Note: No TestCase included as testing the error log is non-trivial.


sql/handler.cc:
  Fixed handler::print_error() to write the error message to error log
  when the table is full.
2009-01-28 17:22:53 +05:30
Alfranio Correia
d9ccc5b6bf auto-merge 5.1-bugteam --> 5.1-bugteam (local) 2009-01-28 10:37:12 +00:00
Magnus Svensson
f81d05c5d3 Bug#42408 Faulty regex for detecting [Warning] and [ERROR] in mysqld error log
- Disable the two patterns that previously have been faulty - for now.
2009-01-28 11:24:55 +01:00
Magnus Svensson
ad94278ba0 WL#4198 mtr.pl v2
- Improve error message for "found warnings in server log file"
2009-01-28 10:28:48 +01:00
Alfranio Correia
0888d7c0a8 BUG#36391: "mysqlbinlog creates invalid charset statements"
The fix for BUG#20103 "Escaping with backslash does not work as expected"
was implemented too greedy though in that it not only changes the behavior
of backslashes within strings but in general, so disabling command shortcuts
like \G or \C (which in turn leads to Bug #36391: "mysqlbinlog creates invalid charset
statements").
      
The fix allows the escaping with backslash to take place only inside a string, 
thus enabling the execution of command shortcuts and presevering the fix for
BUG#20103.
2009-01-27 20:49:37 +00:00
Magnus Svensson
7855b37c9f WL#4189 mtr.pl v2
- First try LOAD DATA INFILE and fall back to LOAD DATA LOCAL INFILE if
   that fails.
2009-01-27 21:14:23 +01:00
Magnus Svensson
8a1a3f714a WL#4189 mtr.pl v2
- Fix the regex for finding core files ie. anything that starts with "core" 
 - Add collection of *.dmp files on windows.
2009-01-27 18:56:24 +01:00
Luis Soares
5f8740cb77 auto merge. 2009-01-27 17:21:15 +01:00
Magnus Svensson
c05c297a2b WL#4198 mtr.pl v2
- Use empty escape char as not to convert "\test" to a tab + "est"
   when loading the servers .err file
2009-01-27 17:00:38 +01:00
Magnus Svensson
04133fcd81 WL#4189 mtr.pl v2
- Remove double escape of [ and ]
2009-01-27 16:44:50 +01:00
Magnus Svensson
db045c0bbd WL#4189 mtr.pl v2
- Bypass --secure-file-priv by loading the file from the client
   using LOAD DATA LOCAL INFILE
2009-01-27 16:35:52 +01:00
Magnus Svensson
3d06fb9138 Bug#42366 server-cert.pem expired: "Not After : Jan 27 08:54:13 2009 GMT 2009-01-27 15:12:08 +01:00
Magnus Svensson
8a73a4beca Merge 2009-01-27 15:10:15 +01:00
Magnus Svensson
377d27b6d5 WL#4189 mtr.pl v2
- Make a rough filtering of the servers error log and write
   all suspicious warnings to $error_log.warnings
   The .warnings file is then examined more carefully by check_warnings.test
 - This will speed things up, doing all of this in a server running
   under valgrind takes far too long time.
2009-01-27 14:53:58 +01:00
Magnus Svensson
b3e1ca1f2c WL#4189 mtr.pl v2
- Add a "skip-ssl=1" to [mysqltest] section so that 
   mysqltest will not run with ssl turned on by default 
   but stil be able to turn it on when requested
 - This avoids that check_warnings and check_testcase
   connects to the server woth SSL turned on
2009-01-27 14:21:18 +01:00
Andrei Elkin
da8df39c14 Bug #31240 load data infile replication between (4.0 or 4.1) and 5.1 fails
Fixing pb failures caused by mtr invokes the test with --tmpdir to which
there are  sensitive operations in the test
and setup_fake_relay_log.inc also needed --secure-file-priv for its own separate
directory.

Fixed with removing SELECT INTO OUTFILE and deploying --exec echo instead in the marco.
The test's opt file should contain --secure-file-priv=$MYSQL_TEST_DIR as the test
operations deal with files located in $MYSQL_TEST_DIR.

mysql-test/include/setup_fake_relay_log.inc:
  Refining setup_fake_relay_log.inc to not use --secure-file-priv sensitive feature.
  The latter should remain available for the test.
2009-01-27 13:33:30 +02:00
Luis Soares
e1487388e4 BUG#42370: rpl_trigger.test: Test case timeout after 900 seconds
The test fails with timeout when applying diff on two tables.

In this test case, there can be a situation when the slave is not yet synced
with the master, thence the changes may not be on the slave at diff time.

This patch addresses this issue by synchronizing master and slave before the
diff takes place.
2009-01-27 12:32:16 +01:00
Magnus Svensson
5e6d3997e9 Bug#42358 fulltext_plugin test fails on pushbuild: Too many arguments (first extra is '')
- pass empty "--plugin-dir" if simple parser was not found.
2009-01-27 10:45:39 +01:00
Magnus Svensson
3dbc5cf418 WL#4189 mtr.pl v2
- Pass verbose flag to My::SafeProcess also when starting
   check_warnings and run_on_all
2009-01-27 10:39:42 +01:00