diff --git a/src/shared/Database/DatabaseMysql.cpp b/src/shared/Database/DatabaseMysql.cpp
index 78110a6bc..8fa8126ba 100644
--- a/src/shared/Database/DatabaseMysql.cpp
+++ b/src/shared/Database/DatabaseMysql.cpp
@@ -481,9 +481,10 @@ enum_field_types MySqlPreparedStatement::ToMySQLType( const SqlStmtFieldData &da
     switch (data.type())
     {
     case FIELD_NONE:    dataType = MYSQL_TYPE_NULL;                     break;
-    case FIELD_BOOL:    dataType = MYSQL_TYPE_BIT;      bUnsigned = 1;  break;
-    case FIELD_I8:      dataType = MYSQL_TYPE_TINY;                     break;
+    // MySQL does not support MYSQL_TYPE_BIT as input type
+    case FIELD_BOOL:    //dataType = MYSQL_TYPE_BIT;      bUnsigned = 1;  break;
     case FIELD_UI8:     dataType = MYSQL_TYPE_TINY;     bUnsigned = 1;  break;
+    case FIELD_I8:      dataType = MYSQL_TYPE_TINY;                     break;
     case FIELD_I16:     dataType = MYSQL_TYPE_SHORT;                    break;
     case FIELD_UI16:    dataType = MYSQL_TYPE_SHORT;    bUnsigned = 1;  break;
     case FIELD_I32:     dataType = MYSQL_TYPE_LONG;                     break;
diff --git a/src/shared/Database/SqlPreparedStatement.h b/src/shared/Database/SqlPreparedStatement.h
index 7f6b974c2..22f0d8f83 100644
--- a/src/shared/Database/SqlPreparedStatement.h
+++ b/src/shared/Database/SqlPreparedStatement.h
@@ -75,7 +75,7 @@ class MANGOS_DLL_SPEC SqlStmtFieldData
         void set(T1 param1);
 
         //getters
-        bool toBool() const { MANGOS_ASSERT(m_type == FIELD_BOOL); return m_binaryData.boolean; }
+        bool toBool() const { MANGOS_ASSERT(m_type == FIELD_BOOL); return static_cast<bool>(m_binaryData.ui8); }
         uint8 toUint8() const { MANGOS_ASSERT(m_type == FIELD_UI8); return m_binaryData.ui8; }
         int8 toInt8() const { MANGOS_ASSERT(m_type == FIELD_I8); return m_binaryData.i8; }
         uint16 toUint16() const { MANGOS_ASSERT(m_type == FIELD_UI16); return m_binaryData.ui16; }
@@ -99,7 +99,7 @@ class MANGOS_DLL_SPEC SqlStmtFieldData
             switch (m_type)
             {
                 case FIELD_NONE:    return 0;
-                case FIELD_BOOL:    return sizeof(bool);
+                case FIELD_BOOL:    //return sizeof(bool);
                 case FIELD_UI8:     return sizeof(uint8);
                 case FIELD_UI16:    return sizeof(uint16);
                 case FIELD_UI32:    return sizeof(uint32);
@@ -124,7 +124,7 @@ class MANGOS_DLL_SPEC SqlStmtFieldData
 };
 
 //template specialization
-template<> inline void SqlStmtFieldData::set(bool val) { m_type = FIELD_BOOL; m_binaryData.boolean = val; }
+template<> inline void SqlStmtFieldData::set(bool val) { m_type = FIELD_BOOL; m_binaryData.ui8 = val; }
 template<> inline void SqlStmtFieldData::set(uint8 val) { m_type = FIELD_UI8; m_binaryData.ui8 = val; }
 template<> inline void SqlStmtFieldData::set(int8 val) { m_type = FIELD_I8; m_binaryData.i8 = val; }
 template<> inline void SqlStmtFieldData::set(uint16 val) { m_type = FIELD_UI16; m_binaryData.ui16 = val; }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 088c1bafb..7d5bb4fc4 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11834"
+ #define REVISION_NR "11835"
 #endif // __REVISION_NR_H__