merge from 5.1

0e625074 · irana · 4b917744 · b9632549 · 0e625074
Commit 0e625074 authored Apr 26, 2012 by irana
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/innobase/fil/fil0fil.c storage/innobase/fil/fil0fil.c +1 -1

No files found.
--- 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);
 	}