Commit graph

56833 commits

Author SHA1 Message Date
Tatiana A. Nurnberg
06cb0ec482 auto-merge 2009-03-23 05:21:02 +01:00
Tatiana A. Nurnberg
deb566d6b3 auto-merge 2009-03-23 05:09:51 +01:00
Tatiana A. Nurnberg
e5a599bd73 Bug#43254: SQL_SELECT_LIMIT=0 crashes command line client
When asking what database is selected, client expected
to *always* get an answer from the server.

We now handle failure more gracefully.

See comments in ticket for a discussion of what happens,
and how things interlock.
2009-03-23 05:08:32 +01:00
Alfranio Correia
b580f3b60b Post-fix BUG#42861. 2009-03-23 01:07:25 +00:00
Alfranio Correia
0a8f0d280c auto-merge 5.1-bugteam (local) --> 5.1-bugteam 2009-03-22 19:46:57 +00:00
Tatiana A. Nurnberg
43c1659946 auto-merge 2009-03-20 19:10:12 +01:00
Tatiana A. Nurnberg
df1a9f6c0b auto-merge 2009-03-20 19:09:00 +01:00
Georgi Kodinov
724d3e8a06 Fixed the failing tests. Addendum to the fix for bug #22504. 2009-03-20 16:49:43 +02:00
Georgi Kodinov
ef4ab5cfaa fixed compilation warnings. addendum to the fix for bug 29125 2009-03-20 16:27:53 +02:00
Georgi Kodinov
4a3c0d800a Fixed a prototype to match the actual function signature (addendum to the
fix for 29125).
2009-03-20 13:35:00 +02:00
Georgi Kodinov
b71a73c7e2 reverting a bogus fix into 5.1-bugteam 2009-03-20 13:18:29 +02:00
Chad MILLER
0c16305409 Merge contributed automake changes, and 5.1 upstream. 2009-03-19 16:18:10 -04:00
Tatiana A. Nurnberg
dc1e9bfb56 Bug#43153: Version comment is too long
mysql-client used static buffer to concatenate server-
version and version_comment. Sufficiently long comments
could get cut off. This was harmless, but looked daft.

Now using a dynamic buffer instead.
2009-03-19 18:42:43 +01:00
Sergey Petrunia
ea31e7f828 Merge 2009-03-19 17:43:01 +03:00
Ignacio Galarza
22b919cc50 auto-merge 2009-03-19 09:59:10 -04:00
Chad MILLER
b4656bd714 Merge bugteam and contributed two patches from
Antony Dovgal <tony @ daylessday.org> .  SCA signed and faxed to
tel:+1-408-715-2540.  Patches tweaked by Chad.
2009-03-19 09:53:54 -04:00
Bernt M. Johnsen
50a38b7407 Bug#43329 merge from 5.1 GCA branch 2009-03-19 14:48:57 +01:00
Ignacio Galarza
8fd4c59ff6 auto-merge 2009-03-19 09:42:36 -04:00
Chad MILLER
f30dda6ff1 Copy include/config.h to include/my_config.h at configure-time. Also,
continue to update it at make-time.

One shouldn't need to run "make" on server source to get the stuff we say
plugins should use.
2009-03-19 09:37:30 -04:00
Sergey Petrunia
108109b5d3 Merge @@optimizer_switch no_xxx -> xxx=off change to 6.0 2009-03-19 15:22:08 +03:00
Horst Hunger
efbaf949f6 due to merge. 2009-03-19 12:30:25 +01:00
Horst Hunger
07ce37f6b4 Reviewed patch for Bug#39862. 2009-03-19 12:21:38 +01:00
Staale Smedseng
4f4c45e163 Merge from 5.0-bugteam 2009-03-19 11:44:57 +01:00
Staale Smedseng
4ecbd0b53d Bug #42502 huge memory leak possible with timezone
functions
      
Unknown timezone specifications are properly rejected
by the server, but are copied into tz_storage before
rejection, and hence is retained until end of server 
life. With sufficiently large bogus timezone specs, 
it is easy to exhaust system memory.
      
Allocation of memory for a copy of the timezone
name is delayed until after verification of validity,
at the cost of a memcpy of the timezone info. This 
only happens once, future lookups will hit the cached
structure.
2009-03-19 11:27:45 +01:00
Bernt M. Johnsen
4a211169c0 Bug#43329 Prepared for push on 5.1 2009-03-19 11:18:52 +01:00
Alexey Kopytov
db08d4f629 Automerge. 2009-03-19 13:09:34 +03:00
Alexey Kopytov
c97060eeab Automerge. 2009-03-19 13:08:15 +03:00
Alexey Kopytov
5e7238e76e Automerge. 2009-03-19 13:07:30 +03:00
Alexey Kopytov
4b7477b976 Automerge. 2009-03-19 13:04:20 +03:00
Alexey Kopytov
a82402dd6f Fixed test failures in 5.1/6.0 introduced by the patch
for bug #41486. Session max_allowed_packet is read-only
as of MySQL 5.1.31. In addition, the global variable
now has no effect on the current session.
2009-03-19 13:02:23 +03:00
Sergey Glukhov
e55b1424af 5.0-bugteam->5.1-bugteam merge 2009-03-19 13:26:12 +04:00
Satya B
59cc98194c Merge 5.0-bugteam to 5.1-bugteam 2009-03-19 14:19:51 +05:30
Sergey Glukhov
a910db2b91 automerge 2009-03-19 12:42:26 +04:00
Sergey Glukhov
28d6b77c23 Bug#41268 Help Text for \c is misleading in client command line interface
fixed help message
2009-03-19 12:37:34 +04:00
Satya B
6ca68ad189 merge to 5.0-bugteam 2009-03-19 13:53:24 +05:30
Sergey Glukhov
5ff4e44bf8 Bug#41627 Illegal mix of collations in LEAST / GREATEST / CASE
Don't throw an error after checking the first and the second arguments.
Continue with checking the third and higher arguments and if some of
them is stronger according to coercibility rules,
then this argument's collation is set as result collation.
2009-03-19 12:20:28 +04:00
Satya B
4f333c876a Fix for BUG#21360 - mysqldump error on federated tables
When loading dump created by mysqldump tool an error is
thrown saying storage engine for the table doesn't have 
an option.
                        
mysqldump tries to re-insert the data into the federated
table which causes the error. Since the data is already
available on the remote server, mysqldump shouldn't try
to dump the data again for FEDERATED tables.
                        
As stated in the bug page, it can be considered similar
to the MERGE ENGINE with "view only" nature.
                        
Fixed by adding the "FEDERATED ENGINE" to the exception
list to ignore the data.
2009-03-19 11:36:37 +05:30
Sergey Petrunia
79909a27eb Merge 2009-03-18 19:08:54 +03:00
Horst Hunger
c216de6e10 due to merge (pull) 2009-03-18 17:36:49 +01:00
Horst Hunger
ea24cef9b2 Due to bug#43733 I disabled "concurrent_innodb_(un)safelog.test" for embedded server. 2009-03-18 17:23:39 +01:00
Bernt M. Johnsen
b011395bfa Bug#43329 prepared for commit on 5.0 2009-03-18 15:07:13 +01:00
Tatiana A. Nurnberg
720f7ed651 auto-merge 2009-03-18 14:19:58 +01:00
Vladislav Vaintroub
e2ba86fb2c merge 2009-03-18 14:20:01 +01:00
Georgi Kodinov
0349dabf61 addendum to the 22047 fix : updated funcs_1 test suite 2009-03-18 14:52:31 +02:00
Chad MILLER
51e0a699a7 Using autoconf definitions instead of manually appending to CFLAGS is
smarter, and according to a contributer, it is necessary for plugin authors
using "--with-debug".
2009-03-18 08:49:05 -04:00
Georgi Kodinov
56c0f724b3 merged 5.1-main -> 5.1-bugteam 2009-03-18 14:34:03 +02:00
Guangbao Ni
1a20ddfef5 Auto-merged from 5.1-bugteam 2009-03-18 15:19:28 +00:00
Guangbao Ni
647821432c Auto-merge from 5.1-bugteam 2009-03-18 15:02:06 +00:00
Guangbao Ni
15d24779e1 Bug #42217 mysql.procs_priv does not get replicated
mysql.procs_priv table itself does not get replicated.
Inserting routine privilege record into mysql.procs_priv table
is triggered by creating function/procedure statements
according to current user's privileges.
Because the current user of SQL thread has GLOBAL_ACL,
which doesn't need any check mysql.procs_priv privilege
when create/alter/execute routines.
Corresponding GLOBAL_ACL privilege user
doesn't insert routine privilege record into
mysql.procs_priv when creating a routine.

Fixed by switching the current user of SQL thread to definer user if
the definer user exists on slave.
That populates procs_priv, otherwise to keep the SQL thread
user and procs_priv remains unchanged.
2009-03-18 13:48:23 +00:00
Tatiana A. Nurnberg
333d4d6c4f auto-merge 2009-03-18 13:31:35 +01:00