diff options
| author | heikki@hundin.mysql.fi <> | 2003-10-07 17:28:59 +0300 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2003-10-07 17:28:59 +0300 |
| commit | 6112853cdab2770e92f9cfefdfef9c0a14b71cb7 (patch) | |
| tree | d53a5cc4e9736e149276ba08d53a7dd09a14b4fd /innobase/trx/trx0trx.c | |
| parent | 862ff0ed1c1dad812af60987d7ec1a2706d3772c (diff) | |
| download | mariadb-git-6112853cdab2770e92f9cfefdfef9c0a14b71cb7.tar.gz | |
Many files:
Multiple tablespaces for InnoDB
sql_table.cc:
Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
sql_update.cc, sql_select.cc, my_base.h:
More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
Diffstat (limited to 'innobase/trx/trx0trx.c')
| -rw-r--r-- | innobase/trx/trx0trx.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/innobase/trx/trx0trx.c b/innobase/trx/trx0trx.c index 1ece349ec6c..292b7cd6f2f 100644 --- a/innobase/trx/trx0trx.c +++ b/innobase/trx/trx0trx.c @@ -105,7 +105,7 @@ trx_create( trx->mysql_log_file_name = NULL; trx->mysql_log_offset = 0; - trx->mysql_master_log_file_name = ""; + trx->mysql_master_log_file_name = (char*)""; trx->mysql_master_log_pos = 0; mutex_create(&(trx->undo_mutex)); @@ -1624,14 +1624,14 @@ trx_print( } buf += sprintf(buf, "\n"); + + if (trx->n_mysql_tables_in_use > 0 || trx->mysql_n_tables_locked > 0) { - if (trx->n_mysql_tables_in_use > 0 || trx->mysql_n_tables_locked > 0) { + buf += sprintf(buf, "mysql tables in use %lu, locked %lu\n", + trx->n_mysql_tables_in_use, + trx->mysql_n_tables_locked); + } - buf += sprintf(buf, "mysql tables in use %lu, locked %lu\n", - trx->n_mysql_tables_in_use, - trx->mysql_n_tables_locked); - } - start_of_line = buf; switch (trx->que_state) { |