1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge 5.1-build up into 5.4-build ("trunk-build").

This commit is contained in:
Joerg Bruehe
2009-09-28 11:39:36 +02:00
7 changed files with 36 additions and 15 deletions

View File

@@ -1535,7 +1535,7 @@ void show_diff(DYNAMIC_STRING* ds,
else
diff_name = 0;
#else
diff_name = "diff"; // Otherwise always assume it's called diff
diff_name = "diff"; /* Otherwise always assume it's called diff */
#endif
if (diff_name)