From b6a1fe246787d2215f5a895635d0c08031e5fda5 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 13 Jan 2006 13:01:19 +0100 Subject: [PATCH 1/2] enabled test added missing debug_return mysql-test/t/disabled.def: enabled test sql/ha_ndbcluster.cc: added missing debug_return --- mysql-test/t/disabled.def | 2 -- sql/ha_ndbcluster.cc | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 4395e7515ec..c794c0388b9 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -21,8 +21,6 @@ type_time : Bug#15805 ps_7ndb : dbug assert in RBR mode when executing test suite rpl_ddl : Bug#15963 SBR does not show "Definer" correctly events : Affects flush test case. A table lock not released somewhere -ndb_autodiscover : TBF with CR -ndb_autodiscover2 : TBF with CR ndb_binlog_basic : Results are not deterministic, Tomas will fix rpl_ndb_basic : Bug#16228 rpl_sp : Bug #16456 diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index ed2a53ed2c6..dad06cb56a4 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -6199,7 +6199,7 @@ NDB_SHARE *ndbcluster_get_share(const char *key, TABLE *table, DBUG_PRINT("error", ("get_share: %s does not exist", key)); if (!have_lock) pthread_mutex_unlock(&ndbcluster_mutex); - return 0; + DBUG_RETURN(0); } if ((share= (NDB_SHARE*) my_malloc(sizeof(*share), MYF(MY_WME | MY_ZEROFILL)))) @@ -6221,7 +6221,7 @@ NDB_SHARE *ndbcluster_get_share(const char *key, TABLE *table, *root_ptr= old_root; if (!have_lock) pthread_mutex_unlock(&ndbcluster_mutex); - return 0; + DBUG_RETURN(0); } thr_lock_init(&share->lock); pthread_mutex_init(&share->mutex, MY_MUTEX_INIT_FAST); @@ -6242,7 +6242,7 @@ NDB_SHARE *ndbcluster_get_share(const char *key, TABLE *table, if (!have_lock) pthread_mutex_unlock(&ndbcluster_mutex); my_error(ER_OUTOFMEMORY, MYF(0), sizeof(*share)); - return 0; + DBUG_RETURN(0); } } share->use_count++; @@ -6258,7 +6258,7 @@ NDB_SHARE *ndbcluster_get_share(const char *key, TABLE *table, share->use_count, share->commit_count)); if (!have_lock) pthread_mutex_unlock(&ndbcluster_mutex); - return share; + DBUG_RETURN(share); } void ndbcluster_real_free_share(NDB_SHARE **share) From c3c21b70f2269d89fb456ef04b4cd2813005078d Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 13 Jan 2006 17:44:37 +0100 Subject: [PATCH 2/2] fix compile error on hp-ux setenv->putenv print slave port as well client/mysqltest.c: fix compile error on hp-ux setenv->putenv mysql-test/mysql-test-run.sh: print slave port as well --- client/mysqltest.c | 12 ++++++++---- mysql-test/mysql-test-run.sh | 11 ++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/client/mysqltest.c b/client/mysqltest.c index 6d596ab793c..acd0fc98ac0 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -273,6 +273,7 @@ typedef struct int alloced_len; int int_dirty; /* do not update string if int is updated until first read */ int alloced; + char *env_s; } VAR; #if defined(__NETWARE__) || defined(__WIN__) @@ -885,16 +886,18 @@ int var_set(const char *var_name, const char *var_name_end, if (env_var) { - char buf[1024]; - memcpy(buf, v->name, v->name_len); - buf[v->name_len]= 0; + char buf[1024], *old_env_s= v->env_s; if (v->int_dirty) { sprintf(v->str_val, "%d", v->int_val); v->int_dirty= 0; v->str_val_len= strlen(v->str_val); } - setenv(buf, v->str_val, 1); + strxmov(buf, v->name, "=", v->str_val, NullS); + if (!(v->env_s= my_strdup(buf, MYF(MY_WME)))) + die("Out of memory"); + putenv(v->env_s); + my_free((gptr)old_env_s, MYF(MY_ALLOW_ZERO_PTR)); } DBUG_RETURN(result); } @@ -4335,6 +4338,7 @@ static VAR *var_init(VAR *v, const char *name, int name_len, const char *val, tmp_var->alloced_len = val_alloc_len; tmp_var->int_val = (val) ? atoi(val) : 0; tmp_var->int_dirty = 0; + tmp_var->env_s = 0; return tmp_var; } diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index e2641472ad2..d18132f7814 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -245,11 +245,12 @@ if [ -n "$MTR_BUILD_THREAD" ] ; then SLAVE_MYPORT=`expr $MASTER_MYPORT + 3` NDBCLUSTER_PORT=`expr $MASTER_MYPORT + 4` - echo "Using MTR_BUILD_THREAD = $MTR_BUILD_THREAD" - echo "Using MASTER_MYPORT = $MASTER_MYPORT" - echo "Using MYSQL_MANAGER_PORT = $MYSQL_MANAGER_PORT" - echo "Using SLAVE_MYPORT = $SLAVE_MYPORT" - echo "Using NDBCLUSTER_PORT = $NDBCLUSTER_PORT" + echo "Using MTR_BUILD_THREAD = $MTR_BUILD_THREAD" + echo "Using MASTER_MYPORT = $MASTER_MYPORT" + echo "Using MYSQL_MANAGER_PORT = $MYSQL_MANAGER_PORT" + echo "Using SLAVE_MYPORT = $SLAVE_MYPORT" + echo "Using NDBCLUSTER_PORT = $NDBCLUSTER_PORT" + echo "Using NDBCLUSTER_PORT_SLAVE = $NDBCLUSTER_PORT_SLAVE" fi NO_SLAVE=0