InnoDB: quote identifiers according to MySQL settings (Bug #5292)

innobase/btr/btr0btr.c:
  Add parameter to ut_print_name() and dict_index_name_print() calls
innobase/btr/btr0cur.c:
  Add parameter to dict_index_name_print() calls
innobase/buf/buf0buf.c:
  Add parameter to dict_index_name_print() calls
innobase/dict/dict0crea.c:
  Add parameter to ut_print_name() calls
innobase/dict/dict0dict.c:
  Add parameter to ut_print_name() calls
  Update documentation links to http://dev.mysql.com
innobase/dict/dict0load.c:
  Add parameter to ut_print_name() calls
innobase/fil/fil0fil.c:
  Use ut_print_filename()
  Update links to documentation to http://dev.mysql.com
innobase/ibuf/ibuf0ibuf.c:
  Replaced printf(...) with fprintf(stderr,...)
innobase/include/dict0dict.h:
  Added trx parameters
innobase/include/row0row.h:
  Added trx parameter
innobase/include/row0sel.h:
  Added trx parameter
innobase/include/row0upd.h:
  Added trx parameters
innobase/include/row0upd.ic:
  Added trx parameter for dict_index_name_print()
innobase/include/trx0rec.h:
  Added trx parameter
innobase/include/ut0ut.h:
  Added ut_print_filename()
  Added trx parameter to ut_print_name() and ut_print_namel()
innobase/lock/lock0lock.c:
  Added parameter to dict_index_name_print() and ut_print_name() calls
innobase/page/page0page.c:
  Added parameter to dict_index_name_print() calls
innobase/pars/pars0opt.c:
  Added parameter to dict_index_name_print() call
innobase/pars/pars0pars.c:
  Added parameter to upd_field_set_field_no() call
innobase/row/row0ins.c:
  Added trx parameters
innobase/row/row0mysql.c:
  Added trx parameters
innobase/row/row0purge.c:
  Added trx parameter
innobase/row/row0row.c:
  Added trx parameter
innobase/row/row0sel.c:
  Added trx parameters
innobase/row/row0umod.c:
  Added trx parameters
innobase/row/row0upd.c:
  Added trx parameters
innobase/trx/trx0rec.c:
  Added trx parameters
innobase/trx/trx0roll.c:
  Added parameter to ut_print_name() calls
innobase/ut/ut0ut.c:
  Added ut_print_filename()
  Added trx parameter to ut_print_namel() and ut_print_name() calls
sql/ha_innodb.cc:
  Added trx parameters
  Rewrote mysql_get_identifier_quote_char()
sql/mysql_priv.h:
  Added get_quote_char_for_identifier()
sql/sql_show.cc:
  Added get_quote_char_for_identifier()
  Removed append_quoted_simple_identifier()
  Make append_identifier() use get_quote_char_for_identifier()

2 files changed, 21 insertions, 24 deletions

diff --git a/innobase/trx/trx0rec.c b/innobase/trx/trx0rec.c
index 382f723a05c..ba93c6de2bd 100644
--- a/innobase/trx/trx0rec.c
+++ b/innobase/trx/trx0rec.c
@@ -770,6 +770,7 @@ trx_undo_update_rec_get_update(
 	dulint		trx_id,	/* in: transaction id from this undo record */
 	dulint		roll_ptr,/* in: roll pointer from this undo record */
 	ulint		info_bits,/* in: info bits from this undo record */
+	trx_t*		trx,	/* in: transaction */
 	mem_heap_t*	heap,	/* in: memory heap from which the memory
 				needed is allocated */
 	upd_t**		upd)	/* out, own: update vector */
@@ -803,7 +804,7 @@ trx_undo_update_rec_get_update(
 
 	upd_field_set_field_no(upd_field,
 			dict_index_get_sys_col_pos(index, DATA_TRX_ID),
-									index);
+								index, trx);
 	dfield_set_data(&(upd_field->new_val), buf, DATA_TRX_ID_LEN);
 
 	upd_field = upd_get_nth_field(update, n_fields + 1);
@@ -812,7 +813,7 @@ trx_undo_update_rec_get_update(
 
 	upd_field_set_field_no(upd_field,
 			dict_index_get_sys_col_pos(index, DATA_ROLL_PTR),
-									index);
+								index, trx);
 	dfield_set_data(&(upd_field->new_val), buf, DATA_ROLL_PTR_LEN);
 	
 	/* Store then the updated ordinary columns to the update vector */
@@ -824,13 +825,13 @@ trx_undo_update_rec_get_update(
 		if (field_no >= dict_index_get_n_fields(index)) {
 			fprintf(stderr,
 "InnoDB: Error: trying to access update undo rec field %lu in ", (ulong) field_no);
-			dict_index_name_print(stderr, index);
+			dict_index_name_print(stderr, trx, index);
 			fprintf(stderr, "\n"
 "InnoDB: but index has only %lu fields\n"
 "InnoDB: Submit a detailed bug report to http://bugs.mysql.com\n"
 "InnoDB: Run also CHECK TABLE ",
 				(ulong) dict_index_get_n_fields(index));
-			ut_print_name(stderr, index->table_name);
+			ut_print_name(stderr, trx, index->table_name);
 			fprintf(stderr, "\n"
 "InnoDB: n_fields = %lu, i = %lu, ptr %p\n",
 				(ulong) n_fields, (ulong) i, ptr);
@@ -841,7 +842,7 @@ trx_undo_update_rec_get_update(
 
 		upd_field = upd_get_nth_field(update, i);
 
-		upd_field_set_field_no(upd_field, field_no, index);
+		upd_field_set_field_no(upd_field, field_no, index, trx);
 
 		if (len != UNIV_SQL_NULL && len >= UNIV_EXTERN_STORAGE_FIELD) {
 
@@ -1266,12 +1267,11 @@ trx_undo_prev_version_build(
 	      mtr_memo_contains(index_mtr, buf_block_align(index_rec), 
 						MTR_MEMO_PAGE_X_FIX));
 	if (!(index->type & DICT_CLUSTERED)) {
-		fputs("InnoDB: Error: trying to access"
-			" update undo rec for non-clustered ", stderr);
-		dict_index_name_print(stderr, index);
-		fputs("\n"
-"InnoDB: Submit a detailed bug report to http://bugs.mysql.com\n"
-			"InnoDB: index record ", stderr);
+		fprintf(stderr, "InnoDB: Error: trying to access"
+			" update undo rec for non-clustered index %s\n"
+			"InnoDB: Submit a detailed bug report to"
+			" http://bugs.mysql.com\n"
+			"InnoDB: index record ", index->name);
 		rec_print(stderr, index_rec);
 		fputs("\n"
 			"InnoDB: record version ", stderr);
@@ -1309,32 +1309,29 @@ trx_undo_prev_version_build(
 	ptr = trx_undo_rec_skip_row_ref(ptr, index);
 
 	ptr = trx_undo_update_rec_get_update(ptr, index, type, trx_id,
-					roll_ptr, info_bits, heap, &update);
+				roll_ptr, info_bits, NULL, heap, &update);
 
 	if (ut_dulint_cmp(table_id, index->table->id) != 0) {
 		ptr = NULL;
 
-		fputs("InnoDB: Error: trying to access"
-			" update undo rec for table ", stderr);
-		ut_print_name(stderr, index->table_name);
-		fputs("\n"
+		fprintf(stderr,
+"InnoDB: Error: trying to access update undo rec for table %s\n"
 "InnoDB: but the table id in the undo record is wrong\n"
 "InnoDB: Submit a detailed bug report to http://bugs.mysql.com\n"
-"InnoDB: Run also CHECK TABLE ", stderr);
-		ut_print_name(stderr, index->table_name);
-		putc('\n', stderr);
+"InnoDB: Run also CHECK TABLE %s\n",
+			index->table_name, index->table_name);
 	}
 
 	if (ptr == NULL) {
 		/* The record was corrupted, return an error; these printfs
 		should catch an elusive bug in row_vers_old_has_index_entry */
 
-		fputs("InnoDB: ", stderr);
-		dict_index_name_print(stderr, index);
-		fprintf(stderr, ", n_uniq %lu\n"
+		fprintf(stderr,
+		"InnoDB: table %s, index %s, n_uniq %lu\n"
 		"InnoDB: undo rec address %p, type %lu cmpl_info %lu\n"
 		"InnoDB: undo rec table id %lu %lu, index table id %lu %lu\n"
 		"InnoDB: dump of 150 bytes in undo rec: ",
+			index->table_name, index->name,
 			(ulong) dict_index_get_n_unique(index),
 			undo_rec, (ulong) type, (ulong) cmpl_info,
 			(ulong) ut_dulint_get_high(table_id),
diff --git a/innobase/trx/trx0roll.c b/innobase/trx/trx0roll.c
index e65755a0f73..eb7c7f43f03 100644
--- a/innobase/trx/trx0roll.c
+++ b/innobase/trx/trx0roll.c
@@ -229,7 +229,7 @@ trx_rollback_to_savepoint_for_mysql(
 	if (trx->conc_state == TRX_NOT_STARTED) {
 		ut_print_timestamp(stderr);
 		fputs("  InnoDB: Error: transaction has a savepoint ", stderr);
-		ut_print_name(stderr, savep->name);
+		ut_print_name(stderr, trx, savep->name);
 		fputs(" though it is not started\n", stderr);
 	        return(DB_ERROR);
 	}
@@ -467,7 +467,7 @@ loop:
 
 		if (table) {		
 			fputs("InnoDB: Table found: dropping table ", stderr);
-			ut_print_name(stderr, table->name);
+			ut_print_name(stderr, trx, table->name);
 			fputs(" in recovery\n", stderr);
 
 			err = row_drop_table_for_mysql(table->name, trx, TRUE);