3122 Davi Arnaut 2010-11-16 [merge]
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
modified:
cmd-line-utils/readline/bind.c
include/m_string.h
include/my_compiler.h
mysys/mf_keycache.c
regex/regexec.c
sql/debug_sync.cc
sql/handler.cc
sql/slave.cc
sql/sql_partition.cc
storage/myisam/ft_nlq_search.c
storage/myisammrg/myrg_open.c
tests/mysql_client_test.c
3121 Marc Alff 2010-11-16 [merge]
Local merge
added:
mysql-test/t/wl4435_generated.inc
modified:
CMakeLists.txt
cmake/configure.pl
cmake/install_macros.cmake
cmake/libutils.cmake
cmake/mysql_add_executable.cmake
cmake/mysql_version.cmake
cmake/plugin.cmake
libmysql/CMakeLists.txt
libservices/CMakeLists.txt
man/CMakeLists.txt
mysql-test/CMakeLists.txt
mysql-test/collections/default.weekly
mysql-test/r/information_schema-big.result
mysql-test/r/not_embedded_server.result
mysql-test/r/partition.result
mysql-test/r/ps.result
mysql-test/r/variables-big.result
mysql-test/suite/parts/inc/partition_auto_increment.inc
mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
mysql-test/suite/parts/r/partition_auto_increment_innodb.result
mysql-test/suite/parts/r/partition_auto_increment_memory.result
mysql-test/suite/parts/r/partition_auto_increment_myisam.result
mysql-test/t/disabled.def
mysql-test/t/not_embedded_server.test
mysql-test/t/partition.test
mysql-test/t/ps.test
mysql-test/t/variables-big.test
mysys/mf_iocache.c
packaging/WiX/create_msi.cmake.in
scripts/CMakeLists.txt
sql-bench/CMakeLists.txt
sql/CMakeLists.txt
sql/ha_partition.cc
sql/handler.h
sql/item.cc
sql/log.cc
sql/log.h
sql/mysqld.cc
sql/mysqld.h
sql/sp_rcontext.h
sql/sql_class.cc
sql/sql_insert.cc
sql/sql_prepare.cc
sql/sql_update.cc
support-files/CMakeLists.txt
support-files/mysql.spec.sh
tests/mysql_client_test.c
win/README
=== modified file 'cmd-line-utils/readline/bind.c'
--- a/cmd-line-utils/readline/bind.c 2009-08-28 16:21:54 +0000
+++ b/cmd-line-utils/readline/bind.c 2010-11-10 21:14:47 +0000
@@ -855,7 +855,7 @@ _rl_read_init_file (filename, include_le
{
register int i;
char *buffer, *openname, *line, *end;
- size_t file_size;
+ size_t file_size = 0;
current_readline_init_file = filename;
current_readline_init_include_level = include_level;
=== modified file 'include/m_string.h'
--- a/include/m_string.h 2010-07-23 20:17:55 +0000
+++ b/include/m_string.h 2010-11-16 09:45:07 +0000
@@ -76,7 +76,9 @@ extern "C" {
extern void *(*my_str_malloc)(size_t);
extern void (*my_str_free)(void *);
-#if defined(HAVE_STPCPY)
+#if MY_GNUC_PREREQ(3, 4)
+#define strmov(dest, src) __builtin_stpcpy(dest, src)
+#elif defined(HAVE_STPCPY)
#define strmov(A,B) stpcpy((A),(B))
#ifndef stpcpy
extern char *stpcpy(char *, const char *); /* For AIX with gcc 2.95.3 */
=== modified file 'include/my_compiler.h'
--- a/include/my_compiler.h 2010-10-20 18:21:40 +0000
+++ b/include/my_compiler.h 2010-11-10 21:14:47 +0000
@@ -76,6 +76,11 @@
/**
Generic (compiler-independent) features.
*/
+
+#ifndef MY_GNUC_PREREQ
+# define MY_GNUC_PREREQ(maj, min) (0)
+#endif
+
#ifndef MY_ALIGNOF
# ifdef __cplusplus
template<typename type> struct my_alignof_helper { char m1; type m2; };
=== modified file 'mysys/mf_keycache.c'
--- a/mysys/mf_keycache.c 2010-07-23 20:15:41 +0000
+++ b/mysys/mf_keycache.c 2010-11-16 09:45:07 +0000
@@ -3963,11 +3963,11 @@ restart:
if (!(block->status & (BLOCK_IN_EVICTION | BLOCK_IN_SWITCH |
BLOCK_REASSIGNED)))
{
- struct st_hash_link *next_hash_link;
- my_off_t next_diskpos;
- File next_file;
- uint next_status;
- uint hash_requests;
+ struct st_hash_link *UNINIT_VAR(next_hash_link);
+ my_off_t UNINIT_VAR(next_diskpos);
+ File UNINIT_VAR(next_file);
+ uint UNINIT_VAR(next_status);
+ uint UNINIT_VAR(hash_requests);
total_found++;
found++;
=== modified file 'regex/regexec.c'
--- a/regex/regexec.c 2007-03-28 17:46:42 +0000
+++ b/regex/regexec.c 2010-11-10 21:14:47 +0000
@@ -117,6 +117,7 @@ size_t nmatch;
my_regmatch_t pmatch[];
int eflags;
{
+ char *pstr = (char *) str;
register struct re_guts *g = preg->re_g;
#ifdef REDEBUG
# define GOODFLAGS(f) (f)
@@ -133,7 +134,7 @@ int eflags;
if ((size_t) g->nstates <= CHAR_BIT*sizeof(states1) &&
!(eflags®_LARGE))
- return(smatcher(preg->charset, g, (char *)str, nmatch, pmatch, eflags));
+ return(smatcher(preg->charset, g, pstr, nmatch, pmatch, eflags));
else
- return(lmatcher(preg->charset, g, (char *)str, nmatch, pmatch, eflags));
+ return(lmatcher(preg->charset, g, pstr, nmatch, pmatch, eflags));
}
=== modified file 'sql/debug_sync.cc'
--- a/sql/debug_sync.cc 2010-07-08 21:20:08 +0000
+++ b/sql/debug_sync.cc 2010-11-16 09:45:07 +0000
@@ -1691,7 +1691,7 @@ static void debug_sync_execute(THD *thd,
if (action->execute)
{
- const char *old_proc_info;
+ const char *UNINIT_VAR(old_proc_info);
action->execute--;
=== modified file 'sql/handler.cc'
--- a/sql/handler.cc 2010-10-18 11:27:52 +0000
+++ b/sql/handler.cc 2010-11-16 09:45:07 +0000
@@ -4160,7 +4160,7 @@ int handler::read_multi_range_first(KEY_
*/
int handler::read_multi_range_next(KEY_MULTI_RANGE **found_range_p)
{
- int result;
+ int UNINIT_VAR(result);
DBUG_ENTER("handler::read_multi_range_next");
/* We should not be called after the last call returned EOF. */
=== modified file 'sql/slave.cc'
--- a/sql/slave.cc 2010-10-16 14:20:35 +0000
+++ b/sql/slave.cc 2010-11-16 09:45:07 +0000
@@ -2513,7 +2513,7 @@ static int exec_relay_log_event(THD* thd
if (slave_trans_retries)
{
- int temp_err;
+ int UNINIT_VAR(temp_err);
if (exec_res && (temp_err= has_temporary_error(thd)))
{
const char *errmsg;
=== modified file 'sql/sql_partition.cc'
--- a/sql/sql_partition.cc 2010-11-05 13:16:27 +0000
+++ b/sql/sql_partition.cc 2010-11-16 09:45:07 +0000
@@ -7484,8 +7484,8 @@ int get_part_iter_for_interval_via_mappi
PARTITION_ITERATOR *part_iter)
{
Field *field= part_info->part_field_array[0];
- uint32 max_endpoint_val;
- get_endpoint_func get_endpoint;
+ uint32 UNINIT_VAR(max_endpoint_val);
+ get_endpoint_func UNINIT_VAR(get_endpoint);
bool can_match_multiple_values; /* is not '=' */
uint field_len= field->pack_length_in_rec();
DBUG_ENTER("get_part_iter_for_interval_via_mapping");
=== modified file 'storage/myisam/ft_nlq_search.c'
--- a/storage/myisam/ft_nlq_search.c 2010-07-23 20:16:29 +0000
+++ b/storage/myisam/ft_nlq_search.c 2010-11-16 09:45:07 +0000
@@ -63,7 +63,7 @@ static int FT_SUPERDOC_cmp(void* cmp_arg
static int walk_and_match(FT_WORD *word, uint32 count, ALL_IN_ONE *aio)
{
- int subkeys, r;
+ int UNINIT_VAR(subkeys), r;
uint keylen, doc_cnt;
FT_SUPERDOC sdoc, *sptr;
TREE_ELEMENT *selem;
=== modified file 'storage/myisammrg/myrg_open.c'
--- a/storage/myisammrg/myrg_open.c 2010-07-20 19:30:10 +0000
+++ b/storage/myisammrg/myrg_open.c 2010-11-16 09:45:07 +0000
@@ -220,7 +220,7 @@ MYRG_INFO *myrg_parent_open(const char *
int (*callback)(void*, const char*),
void *callback_param)
{
- MYRG_INFO *m_info;
+ MYRG_INFO *UNINIT_VAR(m_info);
int rc;
int errpos;
int save_errno;
=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c 2010-11-13 15:05:02 +0000
+++ b/tests/mysql_client_test.c 2010-11-16 09:45:07 +0000
@@ -1199,7 +1199,7 @@ my_bool fetch_n(const char **query_list,
/* Separate thread query to test some cases */
-static my_bool thread_query(char *query)
+static my_bool thread_query(const char *query)
{
MYSQL *l_mysql;
my_bool error;
@@ -1221,7 +1221,7 @@ static my_bool thread_query(char *query)
goto end;
}
l_mysql->reconnect= 1;
- if (mysql_query(l_mysql, (char *)query))
+ if (mysql_query(l_mysql, query))
{
fprintf(stderr, "Query failed (%s)\n", mysql_error(l_mysql));
error= 1;
@@ -6447,7 +6447,7 @@ static void test_prepare_alter()
rc= mysql_stmt_execute(stmt);
check_execute(stmt, rc);
- if (thread_query((char *)"ALTER TABLE test_prep_alter change id id_new varchar(20)"))
+ if (thread_query("ALTER TABLE test_prep_alter change id id_new varchar(20)"))
exit(1);
is_null= 1;
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.5-bugteam branch (davi:3121 to 3122) | Davi Arnaut | 16 Nov |
