diff options
author | unknown <monty@mysql.com> | 2004-03-17 10:36:12 +0200 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-03-17 10:36:12 +0200 |
commit | 219bbd5232d6ff958f97b30abbc0cb9646abf6a8 (patch) | |
tree | 6f4235e7fd4eb101374c74e2c3c02470bb69d2ab /innobase/que/que0que.c | |
parent | b523802138eef0c66d6ce89263b512c1494a277b (diff) | |
parent | b54698374b5eea922a6f054338d804c2ba3aa682 (diff) | |
download | mariadb-git-219bbd5232d6ff958f97b30abbc0cb9646abf6a8.tar.gz |
merge with 4.0
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0sea.c:
Auto merged
innobase/include/log0log.h:
Auto merged
innobase/include/log0log.ic:
Auto merged
innobase/log/log0recv.c:
Auto merged
innobase/page/page0cur.c:
Auto merged
innobase/que/que0que.c:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
mysql-test/r/func_if.result:
Auto merged
mysql-test/t/func_if.test:
Auto merged
Diffstat (limited to 'innobase/que/que0que.c')
-rw-r--r-- | innobase/que/que0que.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/innobase/que/que0que.c b/innobase/que/que0que.c index d31b4e6813c..77495246bb0 100644 --- a/innobase/que/que0que.c +++ b/innobase/que/que0que.c @@ -1036,9 +1036,10 @@ que_thr_stop_for_mysql_no_error( trx->n_active_thrs--; } +#ifdef UNIV_DEBUG /************************************************************************** Prints info of an SQL query graph node. */ - +static void que_node_print_info( /*================*/ @@ -1095,6 +1096,7 @@ que_node_print_info( fprintf(stderr, "Node type %lu: %s, address %p\n", (ulong) type, str, node); } +#endif /* UNIV_DEBUG */ /************************************************************************** Performs an execution step on a query thread. */ |