database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Post-merge fixes.

Browse Source
This commit is contained in:
kostja@bodhi.local
2006-07-14 02:07:37 +04:00
parent d7845b74db
commit 436e7a2dd9
4 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/mysql-test-run.sh
View File

@ -2178,12 +2178,7 @@ then
USE_NDBCLUSTER_OPT= USE_NDBCLUSTER_OPT=
fi fi
# Do not automagically start daemons if we are in gdb or running only one mysql_start
# test case
if [ -z "$DO_GDB" ] && [ -z "$DO_DDD" ]
then
mysql_start
fi
$ECHO "Loading Standard Test Databases" $ECHO "Loading Standard Test Databases"
mysql_loadstd mysql_loadstd
fi fi

6
sql/ha_ndbcluster.cc
View File

@ -7417,15 +7417,13 @@ int
ndb_get_table_statistics(Ndb* ndb, const NDBTAB *ndbtab, ndb_get_table_statistics(Ndb* ndb, const NDBTAB *ndbtab,
struct Ndb_statistics * ndbstat) struct Ndb_statistics * ndbstat)
{ {
DBUG_ENTER("ndb_get_table_statistics");
DBUG_PRINT("enter", ("table: %s", ndbtab->getName()));
NdbTransaction* pTrans; NdbTransaction* pTrans;
NdbError error; NdbError error;
int retries= 10; int retries= 10;
int retry_sleep= 30 * 1000; /* 30 milliseconds */ int retry_sleep= 30 * 1000; /* 30 milliseconds */
char buff[22], buff2[22], buff3[22], buff4[22]; char buff[22], buff2[22], buff3[22], buff4[22];
DBUG_ENTER("ndb_get_table_statistics"); DBUG_ENTER("ndb_get_table_statistics");
DBUG_PRINT("enter", ("table: %s", table)); DBUG_PRINT("enter", ("table: %s", ndbtab->getName()));
DBUG_ASSERT(ndbtab != 0); DBUG_ASSERT(ndbtab != 0);
@ -8170,7 +8168,7 @@ pthread_handler_t ndb_util_thread_func(void *arg __attribute__((unused)))
("Table: %s, commit_count: %llu, rows: %llu", ("Table: %s, commit_count: %llu, rows: %llu",
share->key, share->key,
llstr(stat.commit_count, buff), llstr(stat.commit_count, buff),
llstr(stat.row_count, buff))); llstr(stat.row_count, buff2)));
} }
else else
{ {

1
sql/item.cc
View File

@ -1427,7 +1427,6 @@ bool agg_item_charsets(DTCollation &coll, const char *fname,
LINT_INIT(safe_args[1]); LINT_INIT(safe_args[1]);
if (agg_item_collations(coll, fname, args, nargs, flags, item_sep)) if (agg_item_collations(coll, fname, args, nargs, flags, item_sep))
if (agg_item_collations(coll, fname, args, nargs, flags))
return TRUE; return TRUE;
/* /*

2
sql/item_xmlfunc.cc
View File

@ -2396,7 +2396,7 @@ void Item_xml_str_func::fix_length_and_dec()
nodeset_func= 0; nodeset_func= 0;
if (agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV)) if (agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV, 1))
return; return;
if (collation.collation->mbminlen > 1) if (collation.collation->mbminlen > 1)