Commit graph

56628 commits

Author SHA1 Message Date
Ingo Struewing
fba3a4143b auto-merge 2009-02-27 12:22:10 +01:00
Ingo Struewing
29ca5d019c Bug#40446 - mysql-test-run --gcov is broken
Some variable values were missing and perl constructs failed.

Initialized the variables and refactored the gcov functions.
2009-02-27 12:20:53 +01:00
Magnus Svensson
8bea4016b2 Merge 2009-02-27 11:26:55 +01:00
Tatiana A. Nurnberg
e3233c25b5 Bug#40657: assertion with out of range variables and traditional sql_mode
In STRICT mode, out-of-bounds values caused an error message
to be queued (rather than just a warning), without any further
error-like processing happening. (The error is queued during
update, at which time it's too late. For it to be processed
properly, it would need to be queued during check-stage.)
The assertion rightfully complains that we're trying to send
an OK while having an error queued.

Changeset breaks a lot of tests out into check-stage. This also
allows us to send more correct warnings/error messages.
2009-02-27 10:27:00 +01:00
Patrick Crews
88b906ac21 merge. 2009-02-27 10:45:19 +02:00
Patrick Crews
0ae2ebd627 merge 2009-02-27 10:43:06 +02:00
Patrick Crews
28e64cc32d Bug#41893: main.variables mysql-test fails in new variable like '%alloc%' is added.
Added ORDER BY clause to I_S query to ensure consistent order.
There were differences between 5.1 and 6.0 output.  Correcting it 5.1.
2009-02-27 10:24:57 +02:00
Georgi Kodinov
32a48f06a2 merged 5.0-bugteam -> 5.1-bugteam.
Fixed a warning in 5.1 caused by missing type cast.
2009-02-27 10:03:47 +02:00
Patrick Crews
2c44ef16a5 Merge 5.0->5.1 2009-02-27 09:47:29 +02:00
Georgi Kodinov
494a764174 addendum to the fix for bug : fixed the error returned by SELECT * 2009-02-27 09:41:39 +02:00
Bernt M. Johnsen
d3380a9285 Merged from gca-branch (bug 42567) 2009-02-26 19:21:51 +01:00
Georgi Kodinov
adf6fc1afc null-merged the fix and kept the test for bug from 5.0-bugteam 2009-02-26 19:20:50 +02:00
Bernt M. Johnsen
a4002891fb Prepared for push (BUG#42567) 2009-02-26 18:17:06 +01:00
Georgi Kodinov
b337ac28d0 Bug : Access control is bypassed when all columns
of a view are selected by * wildcard

Backported a part of the fix for 36086 to 5.0
2009-02-26 19:00:44 +02:00
Patrick Crews
bc4df2f65d Bug#41893 - main.variables mysql-test fails if new variable like '%alloc%' is added.
Fixed a typo in the bug fix patch.
2009-02-26 18:00:47 +02:00
Magnus Svensson
49166978b1 Bug#43215 6 error codes changed from 5.1 to 6.0 2009-02-26 15:01:57 +01:00
Ramil Kalimullin
3a29b7afaa Auto-merge 2009-02-26 16:14:33 +04:00
Ramil Kalimullin
ce78a8bd50 Auto-merge 2009-02-26 14:11:46 +04:00
Patrick Crews
1062119af5 Bug#41893: main.variables mysql-test fails if new variable like '%alloc%' is added.
Started fix in 5.0 as the same issue is here.
Revising queries used given what appears to be the scope of this test to only select the manipulated variables.
Added tests for values that are / are not multiples of 1024 to test rounding / constraints.
This behavior is not currently documented (docs bug has been opened)
2009-02-26 10:57:33 +02:00
Bernt M. Johnsen
40d4b57785 Merged from gca-branch (bug 43110) 2009-02-26 09:37:15 +01:00
Ramil Kalimullin
c8e908ffcc Fix for bug#19829:make test Failed in mysql_client_test
*with --with-charset=utf8*

Problem: wrong LONG TEXT field length is sent to a client 
when multibyte server character set used.

Fix: always limit field length sent to a client to 2^32,
as we store it in 4 byte slot.

Note: mysql_client_test changed accordingly.
2009-02-26 12:34:15 +04:00
Vladislav Vaintroub
27e0654246 merge from 5.0-bugteam 2009-02-25 17:27:32 +01:00
Vladislav Vaintroub
451637798a merge from 5.1-bugteam 2009-02-25 17:23:36 +01:00
Vladislav Vaintroub
2e78d2292d merge fix for 43082 from 5.0-bugteam 2009-02-25 17:02:34 +01:00
Vladislav Vaintroub
af4988a36f Bug#43082: mysqld 32 bit cannot use big buffers due to 2GB
usermode address space limit.

Fix: use /LARGEADDRESSAWARE link option when linking 32 bit
executables
2009-02-25 16:57:49 +01:00
Bernt M. Johnsen
63c9d97c0d Prepared for push (BUG#43110) 2009-02-25 16:53:49 +01:00
Bernt M. Johnsen
d158d7da8b merged 5.0 to 5.1, no conflicts 2009-02-25 16:03:35 +01:00
Bernt M. Johnsen
f38e402d79 Merged from gca-branch (bug 43111) 2009-02-25 14:52:33 +01:00
Bernt M. Johnsen
1e503ee440 Merged from gca-branch (bug 43111) 2009-02-25 14:49:59 +01:00
Sergey Glukhov
c51b672c33 5.0-bugteam->5.1-bugteam merge 2009-02-25 16:18:24 +04:00
Bernt M. Johnsen
334d1d6e44 Merged from 5.0
bug#43111
2009-02-25 12:47:28 +01:00
Sergey Glukhov
8587e4f989 Bug#40345 MySQLDump prefixes view name with database name when view references other db
print compact view name if the view belongs to the current database
2009-02-25 15:44:50 +04:00
Davi Arnaut
c1b700faa4 Clean up test case to not leave open connections. 2009-02-25 11:42:58 +01:00
Bernt M. Johnsen
99585ae5e8 Prepare for push of BUG#43111 2009-02-25 11:37:30 +01:00
Sergey Glukhov
412f1d3791 Bug#30305 Create routine in wrong context in SHOW PRIVILEGES
Changed context of Create routine to Databases.
2009-02-25 14:20:20 +04:00
Georgi Kodinov
69ac16429e backport the fix for bug to 5.1-bugteam 2009-02-25 12:19:29 +02:00
Georgi Kodinov
d578311224 automerge 2009-02-25 11:46:01 +02:00
Georgi Kodinov
8fda5211e8 automerge 2009-02-25 11:34:27 +02:00
Georgi Kodinov
f8d39ad5e0 merged main into the working tree 2009-02-25 11:32:53 +02:00
Anurag Shekhar
f0ff3aaead Merging with the bugteam tree. 2009-02-25 14:55:50 +05:30
Georgi Kodinov
1a292ee535 merged bug 31060 to 5.1-bugteam 2009-02-25 11:09:41 +02:00
Alexey Kopytov
647ad03c1c Automerge. 2009-02-25 10:50:32 +02:00
Alexey Kopytov
2e4309c139 Automerge. 2009-02-25 10:49:02 +02:00
Alexey Kopytov
5cf0d591eb Automerge. 2009-02-25 10:48:05 +02:00
Alexey Kopytov
aa9b46c767 Automerge. 2009-02-25 10:39:28 +02:00
Alexey Kopytov
d8130a35fb Fixed a build failure on Ubuntu 8.10 introduced by the patch
for bug .

On some platforms fenv.h may #undef the min/max macros
defined in my_global.h.

Fixed by moving the #include directive for fenv.h from
mysqld.cc to my_global.h before definitions for min/max.
2009-02-25 10:36:11 +02:00
Patrick Crews
592a05fdb5 merge. 2009-02-25 10:16:29 +02:00
Tatiana A. Nurnberg
76e063b9a0 Bug#40657: assertion with out of range variables and traditional sql_mode
In STRICT mode, out-of-bounds values caused an error message
to be queued (rather than just a warning), without any further
error-like processing happening. (The error is queued during
update, at which time it's too late. For it to be processed
properly, it would need to be queued during check-stage.)
The assertion rightfully complains that we're trying to send
an OK while having an error queued.

Changeset breaks a lot of tests out into check-stage. This also
allows us to send more correct warnings/error messages.
2009-02-24 16:42:18 +01:00
Anurag Shekhar
102dd4933c Bug myisamchk: --help output incomplete
In the output message for --help entry for -H --HELP was missing.
Added this entry while printing the help text.
2009-02-24 20:44:47 +05:30
Andrei Elkin
191ccc236e merging bug#37313fixes from 5.0-bt to 5.1-bt 2009-02-24 16:59:46 +02:00