diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-04-19 16:22:58 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-04-19 16:22:58 +0300 |
| commit | ac0f98dd5e361f38767a89bb4623f250db8fb889 (patch) | |
| tree | 592e449197e637225e5da8a20d5b725c4f5f12dc /storage/maria/ma_info.c | |
| parent | ee8f8dd128ffa6fae5270918154526039b8eb80c (diff) | |
| parent | eb7d9500a9909ce594c4d169e70fb5cecbb33e2b (diff) | |
| download | mariadb-git-ac0f98dd5e361f38767a89bb4623f250db8fb889.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
include/maria.h:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_bitmap.c:
Auto merged
storage/maria/ma_check.c:
Auto merged
storage/maria/ma_dynrec.c:
Auto merged
storage/maria/ma_info.c:
Auto merged
storage/maria/ma_open.c:
Auto merged
storage/maria/ma_packrec.c:
Auto merged
storage/maria/ma_page.c:
Auto merged
storage/maria/ma_test1.c:
Auto merged
storage/maria/ma_test2.c:
Auto merged
storage/maria/ma_write.c:
Auto merged
storage/maria/maria_chk.c:
Auto merged
storage/maria/maria_pack.c:
Auto merged
storage/maria/ma_blockrec.c:
Manual merge
storage/maria/ma_close.c:
Manual merge
storage/maria/maria_def.h:
Manual merge
Diffstat (limited to 'storage/maria/ma_info.c')
| -rw-r--r-- | storage/maria/ma_info.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/maria/ma_info.c b/storage/maria/ma_info.c index 612f6342b96..a04fba4e0d8 100644 --- a/storage/maria/ma_info.c +++ b/storage/maria/ma_info.c @@ -126,10 +126,14 @@ void _ma_report_error(int errcode, const char *file_name) if ((length= strlen(file_name)) > 64) { + /* we first remove the directory */ uint dir_length= dirname_length(file_name); file_name+= dir_length; if ((length-= dir_length) > 64) + { + /* still too long, chop start of table name */ file_name+= length - 64; + } } my_error(errcode, MYF(ME_NOREFRESH), file_name); DBUG_VOID_RETURN; |