Commit graph

67785 commits

Author SHA1 Message Date
Bjorn Munch
11746c8000 some more if stmt simplifications 2010-12-17 11:30:59 +01:00
Bjorn Munch
5709298591 null upmerge 2010-12-17 10:41:24 +01:00
Bjorn Munch
453d4fab7b merge from 5.5 main 2010-12-17 10:37:46 +01:00
Bjorn Munch
3e596cee79 merge from 5.1 main up to 3474 2010-12-17 10:13:55 +01:00
Jonathan Perkin
3d799bdffd Merge from mysql-5.5.8-release 2010-12-16 11:13:58 +01:00
Bjorn Munch
f072749e06 upmerge 58511,58522,58608,58092 2010-12-09 15:32:39 +01:00
Bjorn Munch
bff782d0f0 Bug #58511 mysqltest doesn't always run statements in ps mode
mysqltest checks if the stmt is one that should be run in ps mode,
  but regexp doesn't match if preceeded by /* */ comment.
Fix: match function will jump over /*..*/ if found at start
2010-12-09 14:43:42 +01:00
Bjorn Munch
83e7edde87 Bug #58522 mtr --debug leaks memory when test fails
Backported use of setenv() from 5.5
This will remove the leak on systems that have setenv()
I have not fixed the string.c leak, it's a local variable
   that the cleanup function cannot access.
2010-12-09 14:42:04 +01:00
Bjorn Munch
117237a62e Bug #58608 mysqltestrun --help incongruences
Fixed some errors
Added note about 'no' prefix to options
See also follow-up comment to bug report
2010-12-09 14:40:36 +01:00
Bjorn Munch
899a49bcc2 Bug #58282 "mtr --mem" does not work on a machine with libaio installed
Workaround: add --loose-skip-innodb-use-native-aio
Only on linux if explicitly using --mem or setting $OPT_MEM
2010-12-09 14:04:35 +01:00
Bjorn Munch
955f42588e Bug #58695 mysqltest coredumps on "if($x == ){"
Add check that there is a RHS of the expression
Added to mysqltest.test
2010-12-09 12:15:25 +01:00
Bjorn Munch
57f7b9f468 Bug #58710 Valgrind warnings in mysqltest
Var's string value was not 0-terminated if intially null.
While at it, also removed some reported memory leaks
Added sanity check, setting val_len=0 if val==0
2010-12-09 12:14:00 +01:00
Bjorn Munch
d7c04a5996 Bug #58122 Using DBUG_EXECUTE_IF and normal DBUG printouts not compatible
Added option --debug-common which sets 'd' debug flags to the suggested list
2010-12-09 12:10:49 +01:00
Ramil Kalimullin
93efc7e2c4 Fix for bug #58669: read_only not enforced on 5.5.x
Problem: "read-only" option ignored if it's enabled in
the command line (or in the config file).

Fix: sync opt_readonly (which is used for checks) with 
read_only (global var) when all server options are handled.
2010-12-03 20:49:08 +03:00
Bjorn Munch
9dca123d02 Bug #58092 Test "rpl_cross_version" has "copy_file" failing
I am not fixing the test failure
Adds printing of my_errno when commands fail, could hopefully help
2010-12-01 11:11:16 +01:00
Jon Olav Hauglid
a186085a07 Bug #58414 mysql_upgrade fails on dump upgrade between 5.1.53 -> 5.5.8
The problem was that mysql_upgrade failed because DROP DATABASE
refused to drop the 'performance_schema' database when the 
mysql.proc table definition was made temporarily invalid
by dump import.

This patch fixes the problem by adding the error resulting
from opening a damaged mysq.proc table (ER_CANNOT_LOAD_FROM_TABLE),
to the list of errors DROP DATABASE will ignore when trying
to lock stored procedures and functions before deletion.

This problem was a regression introduced by the patch for
Bug#57663.

Test case added to sp-destruct.test.
2010-11-30 18:52:38 +01:00
Vladislav Vaintroub
e3cbf20554 Cherrypicked http://lists.mysql.com/commits/124935
MSI: Only call custom action if REMOVE=ALL is specified, this avoids accidential removing services if  feature states are modified (reported by Iggy)
2010-11-26 16:07:07 +01:00
Bjorn Munch
1be5458ad3 upmerge 58515 2010-11-26 14:30:22 +01:00
Bjorn Munch
7c6151ff18 Bug #58515 Tests: use use exec echo, not write_file to write mysqld.1.expect
Fixed as suggested in the .inc file and two tests
Could not reproduce problem, but tested tests on Windows
2010-11-26 13:59:39 +01:00
Bjorn Munch
2405f2bc55 upmerge 58482 2010-11-26 10:59:09 +01:00
Bjorn Munch
20851e4012 Bug #58412 mysqltest: allow quoting of strings in let and in if comparison
Stripping quotes in let was a bad idea, will not fix
Added code to strip quotes from rhs in comparisons
2010-11-26 10:57:01 +01:00
Bjorn Munch
c639254274 Bug #58482 mtr doesn't use suite names from individually specified test cases
It does work in general, the problem here was that the test name
'alter_table' matches 'main.alter_table-big' which has already been found.
Fixed by matching more explicitly (with/without suite name)
2010-11-25 13:43:58 +01:00
Alexander Nozdrin
671da2e31e Null-merge from mysql-5.5.7-rc-release.
Null-merging revision
'revid: joerg@mysql.com-20101102213229-lyd8tl5gr40dotck'
(Bug_57916: Fix the naming of the proxy_priv table)
from mysql-5.5.7-rc-release.

The patch is already in mysq-5.5.8-release
(revid: georgi.kodinov@oracle.com-20101102154526-coc3muh4mlw91ti8)
2010-11-25 13:57:20 +03:00
Alexander Nozdrin
22a5520cdb Null-merge from mysql-5.5.7-rc-release.
Null-merging revision
'revid: kevin.lewis@oracle.com-20101102151655-b9oe4ii46szw7vx1'
(Bug_57904 - Only one INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS was displayed
per table from Innodb) from mysql-5.5.7-rc-release.

The patch is already in mysql-5.5.8-release
(revid: kevin.lewis@oracle.com-20101102150314-a3jx98sg7wm3emge).
2010-11-25 13:54:30 +03:00
Alexander Nozdrin
75ffc1f7ca Auto-merge from mysql-5.5.7-rc-release. 2010-11-25 13:47:42 +03:00
Alexander Nozdrin
9e3fa25e01 Auto-merge from mysql-5.5.7-rc-release. 2010-11-25 13:46:18 +03:00
Bjorn Munch
08c9f317ee Test sys_vars.shared_memory_base_name_basic used wrong path 2010-11-25 10:28:36 +01:00
Jonathan Perkin
ddbcb7b5c4 Fix the .deb package prefix. 2010-11-25 00:21:28 +00:00
Jonathan Perkin
f2d0f9c5f8 Support alternate license file. 2010-11-24 23:34:00 +00:00
Bjorn Munch
31ae256421 upmerge 58424 and 43418 follow-up 2010-11-24 21:09:08 +01:00
Alexander Nozdrin
a3d073d2cf - Fix changelog (remove duplicated entry)
- Mark main.gis experimental
2010-11-24 18:55:23 +03:00
Alexander Nozdrin
efb1f64073 Bug#45445: cannot execute procedures with thread_stack set to 128k.
Reverting the patch.
2010-11-24 18:08:27 +03:00
Alexander Nozdrin
a92cc88aa5 Bug#55980 Character sets: supplementary character _bin ordering is wrong
Post-fix:
  Reverting the "utf16_bin did not sort supplementary characters
  between U+D700 and U+E000" part. We'll use code-point order.

Committing on behalf of Alexander Barkov.
2010-11-24 17:52:57 +03:00
Alexander Nozdrin
aad23e52c3 Merge from mysql-5.1-security. 2010-11-24 17:11:36 +03:00
Alexander Nozdrin
44764cfb1f Null-merge from mysql-5.1-security (changes already here). 2010-11-24 17:08:06 +03:00
Alexander Nozdrin
cd99840bb0 Null-merge from mysql-5.1-security (changes already here). 2010-11-24 17:02:25 +03:00
Alexander Nozdrin
95c5092f49 Mark a couple of tests experimental. 2010-11-24 16:32:15 +03:00
Alexander Nozdrin
1490f18789 Merge from mysql-5.0-security. 2010-11-24 16:14:43 +03:00
Alexander Nozdrin
b6b7fb2bfa A follow-up for Bug#58339 (Replace Server GPL README file).
Fix formatting issues in README file.
2010-11-24 16:12:23 +03:00
Bjorn Munch
891593e42e merge 58424 2010-11-24 13:51:45 +01:00
Alexander Nozdrin
51d121b417 Empty merge from mysql-5.0-security. 2010-11-24 13:50:32 +03:00
Alexander Nozdrin
7642b38834 Merge from mysql-5.1-bugteam. 2010-11-24 13:43:31 +03:00
Alexander Nozdrin
56f3f2245e Merge from mysql-5.5-bugteam. 2010-11-24 13:43:20 +03:00
Alexander Nozdrin
47cfb2c58c Merge from mysql-5.0-bugteam. 2010-11-24 13:40:32 +03:00
Alexander Nozdrin
7a3636c1af Merge from mysql-5.1-bugteam. 2010-11-24 13:23:44 +03:00
Alexander Nozdrin
d7a4672cf7 Merge from mysql-5.0-bugteam. 2010-11-24 13:07:37 +03:00
Alexander Nozdrin
174a6962da A follow-up for Bug#58340 (Remove Server GPL EXCEPTIONS-CLIENT file) -- remove all
EXCEPTIONS-CLIENT from all the places.
2010-11-24 12:53:39 +03:00
Bjorn Munch
222dd6e138 upmerge 58424 2010-11-24 10:47:50 +01:00
Bjorn Munch
e1fa8cb9bb Bug #58424 mtr ignores failing mysqltest in the presence of expect file for mysqld
If mysqltest dies, mtr waits to see if mysqld dies too within 100ms
But in that case, it should not care about expected crash
Fix: jump past the code that checks the expect file
2010-11-24 10:22:03 +01:00
Jonathan Perkin
7427df4a80 EXCEPTIONS-CLIENT was removed, update the RPM spec file.
While here, support supplying a '-j' flag to make(1) from
the environment.
2010-11-23 15:24:14 +00:00