Commit graph

56981 commits

Author SHA1 Message Date
Tatiana A. Nurnberg
061b5d6523 auto-merge 2009-03-17 18:38:04 +01:00
Tatiana A. Nurnberg
6efe0c341d 36446: fix Windows warning 2009-03-17 18:24:35 +01:00
Georgi Kodinov
49c6e74746 merge 5.0-bugteam -> 5.1-bugteam 2009-03-17 16:33:54 +02:00
Georgi Kodinov
799551a4c3 auto-merge 2009-03-17 16:32:44 +02:00
Georgi Kodinov
7af84377cc Bug 22047: Time in SHOW PROCESSLIST for SQL thread in replication seems to
become negative

- merged the fix to 5.1
- extended to cover I_S.PROCESSLIST.TIME
- Changed the column type of I_S.PROCESSLIST.TIME from LOGNLONG
  UNSIGNED
  to LONG (to match the SHOW PROCESSLIST type)
- Added a test case
2009-03-17 16:29:16 +02:00
Georgi Kodinov
718efce059 merged 5.0-bugteam -> bug 22047 2009-03-17 16:28:05 +02:00
Horst Hunger
e9c874224b Fix for bug 39484 after review. I inserted the review results (also including the patches itself):
"Release_lock("hello")" is now also successful when delivering NULL, replaced two sleeps by wait_condition. The last two "sleep 1" have not been replaced as all tried wait conditions leaded to nondeterministic results, especially to succeeding concurrent updates. To replace the sleeps there should be some time planned (or internal knowledge of the server may help).
2009-03-17 14:43:43 +01:00
Tatiana A. Nurnberg
bacb0357c9 auto-merge 2009-03-17 08:59:07 +01:00
Ramil Kalimullin
7178e47a3c Code clean-up. 2009-03-17 11:04:15 +04:00
Patrick Crews
c86055b325 Bug#41307: Tests using include/ndb_backup.inc won't work on Windows due to 'grep' call.
Re-recording of .result files for additional tests that use this include file.
2009-03-16 17:36:14 -04:00
Tatiana A. Nurnberg
05269b7b05 automerge 2009-03-16 21:21:10 +01:00
Tatiana A. Nurnberg
2849db95fc manual merge 2009-03-16 20:54:50 +01:00
Sergey Petrunia
ae3a1b8c06 Fix wrong parameter name which caused compile failure on windows 2009-03-16 20:45:03 +03:00
Sergey Petrunia
9782169b29 Merge 2009-03-16 20:10:03 +03:00
Sergey Petrunia
64603af1b9 @@optimizer_switch switch from no_xxx to xxx={on|off} syntax:
- Fix valgrind warning on attempt to run a "SET optimizer_switch=number" statement.
  Need to call c_ptr_safe() as strings returned by non-string items are not 
  necessarily null-terminated.
2009-03-16 20:02:55 +03:00
Patrick Crews
bfcfbbbc32 merge 2009-03-16 12:35:32 -04:00
Tatiana A. Nurnberg
611a09f596 Bug#36446: Attempt to set @@join_buffer_size to its minimum value produces spurious warning
If a sys-var has a base and a block-size>1, and then a
user-supplied value >= minimum ended up below minimum
thanks to block-size alignment, we threw a warning.
This meant for instance that when getting, then setting
the minimum, we'd see a warning. This was needlessly
confusing. (updated patch)
2009-03-16 16:11:45 +01:00
Alexey Kopytov
b00996e85f Manual merge of patch for bug #40552 into the team tree.
Replaced a call to load_defaults() in sql_plugin.cc with 
its thread-safe version.
2009-03-16 13:37:13 +03:00
Leonard Zhou
b843ea8bf8 Merge 2009-03-16 17:06:22 +08:00
Alexey Kopytov
a6da1b4a38 Automerge. 2009-03-19 10:15:08 +03:00
Chad MILLER
078a9762ad Merge bugteam and fix for 42675. 2009-03-18 18:38:30 -04:00
Chad MILLER
5ac1f353e1 Merge fix for 39326 and bugteam tree. 2009-03-18 15:16:48 -04:00
Alexey Kopytov
4d36f9967f Automerge. 2009-03-18 16:43:42 +03:00
Alexey Kopytov
083e77acd3 Automerge. 2009-03-18 16:32:43 +03:00
Alexey Kopytov
f253c54421 Automerge. 2009-03-18 11:38:34 +03:00
Alexey Kopytov
a0dd40a21c Automerge. 2009-03-18 11:36:48 +03:00
Chad MILLER
2443683f50 Fix indentation. tab -> spaces 2009-03-17 15:43:00 -04:00
Chad MILLER
926c530c7d Bug#42675: Dangling pointer leads to a client crash (mysys/my_error.c \
patch enclosed)
  
One call to my_error_unregister_all() would free pointers, but leave one
pointer to just-freed memory still assigned.  That's the bug.  Subsequent
calls of this function would try to follow pointers into deallocated, 
garbage memory and almost certainly SEGV.

Now, after freeing a linked list, unset the initial pointer.
2009-03-17 15:31:07 -04:00
Chad MILLER
e7ed43065a Fix several quoting problems, and clean up IFS on failure in my_which(). 2009-03-16 15:28:06 -04:00
Chad MILLER
e53a813352 Bug#39326: mysqld_safe doesn't use --basedir value in search of \
my_print_defaults

Now use basedir to set an unset ledir and to find the location of
my_print_defaults .
2009-03-16 14:54:28 -04:00
Leonard Zhou
650a5722b3 BUG#22504 load data infile sql statement in replication architecture get error
The problem is issued because we set wrong start position and stop position of query string into binlog.
That two values are stored as part of head info of query string.
When we parse binlog, we first get position values then get the query string according position values.
But seems that two values are not calculated correctly after the parse of Yacc.

We don't want to touch so much of yacc because it may influence other codes.
So just add one space after 'INTO' key word when parsing.
This can easily resolve the problem.
2009-03-16 16:21:29 +08:00
Ramil Kalimullin
0a05053593 Fix for bug #42957: no results from
select where .. (col=col and col=col) or ... (false expression)

Problem: optimizer didn't take into account a singular case 
when we eliminated all the predicates at the AND level of WHERE.
That may lead to wrong results.

Fix: replace (a=a AND a=a...) with TRUE if we eliminated all the
predicates.
2009-03-16 09:02:10 +04:00
Patrick Crews
7648f4aee7 merge 5.0 -> 5.1 2009-03-15 18:39:48 -04:00
Patrick Crews
e54bad485d Bug#41307: Tests using include/ndb_backup.inc won't work on Windows due to 'grep' call.
Revised patch incorporating cleaner test code brought up during review.
Removed the use of grep and accomplished same actions via SQL / use of the server.

Runs as before on *nix systems and now runs on Windows without Cygwin as well.
2009-03-15 12:25:14 -04:00
Sergey Petrunia
f7098d5ada Merge 2009-03-14 22:04:31 +03:00
Sergey Petrunia
c7e44fddfc @@optimizer_switch backport and change from no_xxx to xx=on|off: post-review fixes 2009-03-14 21:58:23 +03:00
Andrei Elkin
f5a211f96b merge from 5.1-bt to a local branch 2009-03-13 22:02:16 +02:00
Jonathan Perkin
3ed5a61f29 Raise version number after cloning 5.1.33 2009-03-13 21:01:19 +01:00
Andrei Elkin
3393fd195a merge from 5.1-bt to a local branch 2009-03-13 21:49:37 +02:00
Magnus Svensson
788c1e7e7b Bug#43361 msyql_client_test output lost
- Print the output(if any) from the command that failed, in many 
   cases this will make it possible to immediately see what went wrong.
2009-03-13 16:06:50 +01:00
Georgi Kodinov
8a5a804530 Bug #22047 : Time in SHOW PROCESSLIST for SQL thread in replication
seems to become negative

THD::start_time has a dual meaning : it's either the time since the process
entered a given state or is the transaction time returned by e.g. NOW().
This causes problems, as sometimes THD::start_time may be set to a value
that is correct and needed when used as a base for NOW(), but these times
may be arbitrary (SET @@timestamp) or non-local (coming from the master 
through the replication feed).
If one such non-local time is set there's no way to return a correct value
for e.g. SHOW PROCESSLIST or SELECT ... FROM INFORMATION_SCHEMA.PROCESSLIST.
Fixed by making the Time column in SHOW PROCESSLIST SIGNED LONG instead of 
UNSIGNED LONG and doing the correct conversions.
      
Note that no reliable test suite can be constructed, since it would require
knowing the local time and can't be achieved by the means of the current test
suite.
2009-03-13 15:51:25 +02:00
Georgi Kodinov
c14a43cd40 Bug #43614: make distcheck failure (ndb/Makefile is made, but not subdirs of ndb)
There are some recursive targets that automake generates which reference
DIST_SUBDIRS.  It's critical, then, for such subdirs to exist even if they
won't be built as part of SUBDIRS.

During a VPATH build, it is the configure script which creates the subdirs
(when it processes the AC_CONFIG_FILES() for each subdir's Makefile).  If
autoconf doesn't create a subdir's Makefile, then the recursive make will fail
when it is unable to cd into that subdir.

This isn't a problem in non-VPATH builds, because the subdirs are all present
in the source tarball.  So the problem only shows up during 'make distcheck',
which does a VPATH build.

The fix is to look, when configure is being created by autoconf, for any
plugin subdirectories.  These are the dynamic subdirectories which need to be
handled specially.  It's enough to tell autoconf to generate a Makefile for
any Makefile.am found in the plugin directory - all plugin subdirectories
using automake (i.e., listed in the plugin's DIST_SUBDIRS) will have a
Makefile.am.

This is done by calling 'find'.  This means that 'find' must be in the PATH on
the host that is running autoconf.  'find' is NOT needed when calling
configure, so it is not an additional dependency for the user.

Finally, ha_ndbcluster.m4 had called AC_CONFIG_FILES() on all those subdir
Makefiles, but only when the plugin was actually being built.  So it didn't
work in the case that NDB was not being built.  All of those Makefiles have to
be removed from this static list, since the plugin machinery is now adding
them automatically.  autoconf fails if a file is duplicated in
AC_CONFIG_FILES().
2009-03-13 13:13:55 +02:00
Sergey Glukhov
396ab324e2 compilation(embedded server) failure fix 2009-03-13 14:25:50 +04:00
Sergey Glukhov
61dad6bb65 automerge 2009-03-13 13:31:11 +04:00
Georgi Kodinov
327c3f3f19 addendum to bug #36540 : fix the funcs_1 test suite. 2009-03-13 11:16:32 +02:00
Georgi Kodinov
44a15ae336 merged 5.0-bugteam 2009-03-13 11:02:30 +02:00
Sergey Glukhov
390afdd16e Bug#42610 Dynamic plugin broken in 5.1.31
--added ability to obtain plugin variables from my.cnf on INSTALL PLUGIN stage
--option 'ignore-builtin-innodb' disables all InnoDB builtin plugins
  (including I_S plugins)
2009-03-13 12:51:25 +04:00
Tatiana A. Nurnberg
ec39e58d13 automerge 2009-03-12 19:06:26 +01:00
Chad MILLER
8725bcd944 Merge bug fix and upstream. 2009-03-12 13:32:13 -04:00
Tatiana A. Nurnberg
c4cd361fc4 manual merge for 40657 beautification 2009-03-12 17:55:10 +01:00