summaryrefslogtreecommitdiff
path: root/innobase/pars
diff options
context:
space:
mode:
authorjani@hynda.mysql.fi <>2001-11-05 23:48:03 +0200
committerjani@hynda.mysql.fi <>2001-11-05 23:48:03 +0200
commitd0e83062036a8da0bf02dd24070dd138b843ce80 (patch)
tree008020b20467d6720f9edf373f9b4aa9624c5918 /innobase/pars
parent8e2bfcb876314dc0bb334720b4eac7e70a3c4354 (diff)
downloadmariadb-git-d0e83062036a8da0bf02dd24070dd138b843ce80.tar.gz
Added xml patch to mysqldump.
Made innodb to compile more cleanly with debugging options enabled. Fixed a few bugs and found a few possible bugs, which I hope Heikki will check. Comments needs to be fixed too. Some while() functions should be changed to do ... until for documenting purposes, because some of them must and will be processed at least once, or a variable would be used uninitialized. Regards, Jani
Diffstat (limited to 'innobase/pars')
-rw-r--r--innobase/pars/pars0opt.c3
-rw-r--r--innobase/pars/pars0pars.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/innobase/pars/pars0opt.c b/innobase/pars/pars0opt.c
index 6f4957f96ee..35d39caad00 100644
--- a/innobase/pars/pars0opt.c
+++ b/innobase/pars/pars0opt.c
@@ -528,7 +528,7 @@ opt_search_plan_for_table(
ulint goodness;
ulint last_op;
ulint best_goodness;
- ulint best_last_op;
+ ulint best_last_op = 0; /* remove warning */
ulint mix_id_pos;
que_node_t* index_plan[128];
que_node_t* best_index_plan[128];
@@ -546,6 +546,7 @@ opt_search_plan_for_table(
best_index = index; /* Eliminate compiler warning */
best_goodness = 0;
+ /* should be do ... until ? comment by Jani */
while (index) {
goodness = opt_calc_index_goodness(index, sel_node, i,
index_plan, &last_op);
diff --git a/innobase/pars/pars0pars.c b/innobase/pars/pars0pars.c
index 8ffbca579b8..664f498ef3e 100644
--- a/innobase/pars/pars0pars.c
+++ b/innobase/pars/pars0pars.c
@@ -1942,7 +1942,7 @@ Called by yyparse on error. */
void
yyerror(
/*====*/
- char* s) /* in: error message string */
+ char* s __attribute__((unused))) /* in: error message string */
{
ut_ad(s);