diff options
| author | irana <irana@dscczz01.us.oracle.com> | 2012-04-26 08:21:25 -0700 |
|---|---|---|
| committer | irana <irana@dscczz01.us.oracle.com> | 2012-04-26 08:21:25 -0700 |
| commit | 02522904bc28703ff7130db2a34d3e38edf2a8e4 (patch) | |
| tree | 6dbe29544c3f340222b90240a6ae8be76b62436d /storage/innobase/fil | |
| parent | 3f98e95354b6d1c55a824bb1b314e3bb8c465ef0 (diff) | |
| parent | 1a2cf649dc411b47122419cb9e8c8ef1a26ae91a (diff) | |
| download | mariadb-git-02522904bc28703ff7130db2a34d3e38edf2a8e4.tar.gz | |
merge from 5.1
Diffstat (limited to 'storage/innobase/fil')
| -rw-r--r-- | storage/innobase/fil/fil0fil.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/fil/fil0fil.c b/storage/innobase/fil/fil0fil.c index 2390333b393..0a467d40345 100644 --- a/storage/innobase/fil/fil0fil.c +++ b/storage/innobase/fil/fil0fil.c @@ -1908,7 +1908,7 @@ fil_inc_pending_ops( if (space == NULL) { fprintf(stderr, - "InnoDB: Error: trying to do ibuf merge to a" + "InnoDB: Error: trying to do an operation on a" " dropped tablespace %lu\n", (ulong) id); } |