diff options
author | unknown <marko@hundin.mysql.fi> | 2004-10-01 14:17:05 +0300 |
---|---|---|
committer | unknown <marko@hundin.mysql.fi> | 2004-10-01 14:17:05 +0300 |
commit | 9e6d10146cd9aef0132aa1ee27cb11dd4de5d094 (patch) | |
tree | 9677f13f29c93b0c65083bc23680739efeb821b9 /innobase/pars/pars0opt.c | |
parent | bff40d61ae67455dd7ae70bd75923dac63fbae51 (diff) | |
parent | a418a35ceba85354328b5f75bb4e908f88b6759f (diff) | |
download | mariadb-git-9e6d10146cd9aef0132aa1ee27cb11dd4de5d094.tar.gz |
Merge marko@build.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/j/mysql-4.1
innobase/btr/btr0btr.c:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0row.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'innobase/pars/pars0opt.c')
-rw-r--r-- | innobase/pars/pars0opt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/pars/pars0opt.c b/innobase/pars/pars0opt.c index 7ba4af15243..0d487f6e54a 100644 --- a/innobase/pars/pars0opt.c +++ b/innobase/pars/pars0opt.c @@ -1229,7 +1229,7 @@ opt_print_query_plan( } fputs("Table ", stderr); - dict_index_name_print(stderr, plan->index); + dict_index_name_print(stderr, NULL, plan->index); fprintf(stderr,"; exact m. %lu, match %lu, end conds %lu\n", (unsigned long) plan->n_exact_match, (unsigned long) n_fields, |