From 17265468aca17b5f54a84733527b8afad78be729 Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Fri, 11 May 2007 20:56:22 +0500
Subject: merging fixes

---
 sql/my_decimal.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'sql/my_decimal.h')

diff --git a/sql/my_decimal.h b/sql/my_decimal.h
index b19d6e40cb4..9558b00f0cf 100644
--- a/sql/my_decimal.h
+++ b/sql/my_decimal.h
@@ -395,6 +395,7 @@ int my_decimal_intg(const my_decimal *a)
 }
 
 
+inline
 void my_decimal_trim(ulong *precision, uint *scale)
 {
   if (!(*precision) && !(*scale))
-- 
cgit v1.2.1