into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
mysql-test/r/select_found.result:
Auto merged
mysql-test/t/select_found.test:
Auto merged
sql/sql_select.cc:
Auto merged
Added a test case for bug #7945.
sql_select.cc:
Fixed bug #7945. If DISTINCT is used only with constants
in a query with GROUP BY, we can apply an optimization
that set LIMIT to 1 only in the case when there is
no SQL_CALC_FOUND_ROWS.
sql/sql_select.cc:
Fixed bug #7945. If DISTINCT is used only with constants
in a query with GROUP BY, we can apply an optimization
that set LIMIT to 1 only in the case when there is
no SQL_CALC_FOUND_ROWS.
mysql-test/t/select_found.test:
Added a test case for bug #7945.
mysql-test/r/select_found.result:
Added a test case for bug #7945.
Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free(), in DROP TABLE or in ALTER TABLE
innobase/fil/fil0fil.c:
Fix a race condition that could cause the assertion space->n_pending_flushes == 0 to fail in fil0fil.c, in fil_space_free()
Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works
innobase/fil/fil0fil.c:
Fix bug #8021 :Windows error number 87 with multiple tablespaces after mysqld restart; still has to be tested on Windows that this now works
Bug#7834 Illegal mix of collations in IN operator
IN was the first function supporting
character set convertion.
agg_arg_charsets() was written afterwards,
which is more flexible.
Now IN just reuses this function.
sql/item_cmpfunc.cc:
Bug#7834 Illegal mix of collations in IN operator
IN was the first function supporting
character set convertion.
agg_arg_charsets() was written afterwards,
which is more flexible.
Now IN just reuses this function.
environment (using "build" on SUSE Linux)
Build-tools/Do-rpm:
- added functionality to perform RPM builds inside of a chrooted build
environment (using "build" on SUSE Linux) - see "--help" for more details
Add SJIS version of Japanese error messages.
Windows version should include this new file,
instead of the EUC-JP version.
configure.in:
Add SJIS version of Japanese error messages.
Windows version should include this new file,
instead of the EUC-JP version.
(Simpler fix than last commit -- no need to mess with base_cxxflags.)
BUILD/compile-amd64-max:
use $max_cflags
BUILD/compile-pentium-debug-max:
use $max_cflags
BUILD/compile-pentium-debug-max-no-embedded:
use $max_cflags
BUILD/compile-pentium-max:
use $max_cflags
BUILD/compile-pentium-valgrind-max:
use $max_cflags
BUILD/compile-ppc-debug-max:
use $max_cflags
BUILD/compile-ppc-max:
use $max_cflags
BUILD/compile-amd64-debug-max:
use $max_cflags, remove unnecessary base_cxxflags stuff
This patch collects all previous patches into one.
The main problem was due to that there is are two variables -
dflt_key_cache and sql_key_cache with have more or less duplicate
function. The reson for the bug was that the default value in the key
cache hash was set to dflt_key_cache, then sql_key_cache was set to a
new key cache object, and then dflt_key_cache was set to sql_key_cache
which was different from the dflt_key_cache_var. After sending SIGHUP,
the server was using the original default value for the key cache hash,
which was different from the actual key cache object used for the
default key cache.
include/keycache.h:
Import patch 4285.diff
mysys/mf_keycache.c:
Import patch 4285.diff
sql/mysql_priv.h:
Import patch 4285.diff
sql/mysqld.cc:
Import patch 4285.diff
sql/set_var.cc:
Import patch 4285.diff
sql/sql_parse.cc:
Import patch 4285.diff
sql/sql_show.cc:
Import patch 4285.diff
when using shm transporter, set sigmask on each thread using pthread_sigmask
configure.in:
Add more functions needed for SHM
ndb/src/common/portlib/NdbThread.c:
1) Create thread wrapper function
2) block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
ndb/src/common/transporter/TransporterRegistry.cpp:
(un)block SIGUSR1 #ifdef NDB_SHM_TRANSPORTER
sql/ha_ndbcluster.cc:
cast pointer to UintPtr before printout
mysql-test/r/union.result:
result for a test case for the wrong examined rows with UNION's
mysql-test/t/union.test:
test case for the wrong examined rows with UNION's
sql/sql_union.cc:
a patch for the wrong examined rows with UNION's
source RPM): use "mysqladmin ping" instead of grepping the process list
for the mysqld binary (should be more portable than relying on the "ps"
options
support-files/mysql-log-rotate.sh:
- small improvement (patch found in the SUSE source RPM): use "mysqladmin ping"
instead of grepping the process list for the mysqld binary (should be more
portable than relying on the "ps" options
prefix", which roots were fixed in 4.0 tree.
mysql-test/r/alter_table.result:
Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
prefix".
mysql-test/t/alter_table.test:
Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP
prefix".
