diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 08:48:22 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-05-13 08:54:43 +0300 |
| commit | 7f7211073ceec9d35947ec5c9286878cfa4d3d78 (patch) | |
| tree | 6ae832941ec3f6f3fc884d11518446186a9e1077 | |
| parent | cb248f880619431850e5638009a6098048050edf (diff) | |
| download | mariadb-git-7f7211073ceec9d35947ec5c9286878cfa4d3d78.tar.gz | |
MDEV-19441 Typo in error message "InnoDB: FTS Doc ID must be large than"
row_insert_for_mysql(): Correct the grammar error, and
display the table name in both messages.
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/row/row0mysql.cc | 15 | ||||
| -rw-r--r-- | storage/xtradb/handler/ha_innodb.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/row/row0mysql.cc | 15 |
4 files changed, 16 insertions, 18 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 025df01adc7..8b007bb0b38 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -13520,7 +13520,7 @@ innodb_rec_per_key( } /* If the number of NULL values is the same as or - large than that of the distinct values, we could + larger than that of the distinct values, we could consider that the table consists mostly of NULL value. Set rec_per_key to 1. */ if (n_diff <= n_null) { diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc index 21a5f6d9f09..966448b502c 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -1490,8 +1490,9 @@ error_exit: doc_id = fts_get_doc_id_from_row(table, node->row); if (doc_id <= 0) { - fprintf(stderr, - "InnoDB: FTS Doc ID must be large than 0 \n"); + ib_logf(IB_LOG_LEVEL_ERROR, + "FTS_DOC_ID must be larger than 0" + " for table %s", table->name); err = DB_FTS_INVALID_DOCID; trx->error_state = DB_FTS_INVALID_DOCID; goto error_exit; @@ -1502,12 +1503,10 @@ error_exit: = table->fts->cache->next_doc_id; if (doc_id < next_doc_id) { - fprintf(stderr, - "InnoDB: FTS Doc ID must be large than" - " " UINT64PF " for table", - next_doc_id - 1); - ut_print_name(stderr, trx, TRUE, table->name); - putc('\n', stderr); + ib_logf(IB_LOG_LEVEL_ERROR, + "FTS_DOC_ID must be larger than " + UINT64PF " for table %s", + next_doc_id - 1, table->name); err = DB_FTS_INVALID_DOCID; trx->error_state = DB_FTS_INVALID_DOCID; diff --git a/storage/xtradb/handler/ha_innodb.cc b/storage/xtradb/handler/ha_innodb.cc index fb29a10466b..df925327c1c 100644 --- a/storage/xtradb/handler/ha_innodb.cc +++ b/storage/xtradb/handler/ha_innodb.cc @@ -14107,7 +14107,7 @@ innodb_rec_per_key( } /* If the number of NULL values is the same as or - large than that of the distinct values, we could + larger than that of the distinct values, we could consider that the table consists mostly of NULL value. Set rec_per_key to 1. */ if (n_diff <= n_null) { diff --git a/storage/xtradb/row/row0mysql.cc b/storage/xtradb/row/row0mysql.cc index 111ee70f1af..a5192dcad8f 100644 --- a/storage/xtradb/row/row0mysql.cc +++ b/storage/xtradb/row/row0mysql.cc @@ -1476,8 +1476,9 @@ error_exit: doc_id = fts_get_doc_id_from_row(table, node->row); if (doc_id <= 0) { - fprintf(stderr, - "InnoDB: FTS Doc ID must be large than 0 \n"); + ib_logf(IB_LOG_LEVEL_ERROR, + "FTS_DOC_ID must be larger than 0" + " for table %s", table->name); err = DB_FTS_INVALID_DOCID; trx->error_state = DB_FTS_INVALID_DOCID; goto error_exit; @@ -1488,12 +1489,10 @@ error_exit: = table->fts->cache->next_doc_id; if (doc_id < next_doc_id) { - fprintf(stderr, - "InnoDB: FTS Doc ID must be large than" - " " UINT64PF " for table", - next_doc_id - 1); - ut_print_name(stderr, trx, TRUE, table->name); - putc('\n', stderr); + ib_logf(IB_LOG_LEVEL_ERROR, + "FTS_DOC_ID must be larger than " + UINT64PF " for table %s", + next_doc_id - 1, table->name); err = DB_FTS_INVALID_DOCID; trx->error_state = DB_FTS_INVALID_DOCID; |