diff options
author | unknown <monty@mashka.mysql.fi> | 2002-09-11 06:44:45 +0300 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-09-11 06:44:45 +0300 |
commit | d221f3ff172305e4576505180408e4ac2ba2a6c2 (patch) | |
tree | 9f13bcfe6e049a7e4fbad2a5da068a0635d8b038 /innobase/btr | |
parent | f30b0eacedb213edc35f19ecdd861cd4bf1e8d87 (diff) | |
parent | 8f232cb75f0dce72142e2b584f2cdac4a1de517d (diff) | |
download | mariadb-git-d221f3ff172305e4576505180408e4ac2ba2a6c2.tar.gz |
merge
mysys/thr_alarm.c:
Auto merged
sql/sql_table.cc:
Auto merged
Docs/manual.texi:
merge (Removed bug fix comments for not relesed version)
Diffstat (limited to 'innobase/btr')
-rw-r--r-- | innobase/btr/btr0cur.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c index bab5c78b712..25a7060883c 100644 --- a/innobase/btr/btr0cur.c +++ b/innobase/btr/btr0cur.c @@ -808,7 +808,7 @@ btr_cur_optimistic_insert( if (!dtuple_check_typed_no_assert(entry)) { fprintf(stderr, -"InnoDB: Error in a tuple to insert into table %lu index %s\n", +"InnoDB: Error in a tuple to insert into table %s index %s\n", index->table_name, index->name); } |