MDEV-20865 Cleanups: dead code, typo.

include/my_global.h

@@ -104,9 +104,9 @@
 #endif
 
 #ifdef WITH_PARTITION_STORAGE_ENGINE
-#define IF_PARTITIONING(A,B) A
+#define IF_PARTITIONING(A,B) (A)
 #else
-#define IF_PARTITIONING(A,B) B
+#define IF_PARTITIONING(A,B) (B)
 #endif
 
 #if defined (_WIN32)

sql/sql_const.h

@@ -29,7 +29,7 @@
 /* extra 4+4 bytes for slave tmp tables */
 #define MAX_DBKEY_LENGTH (NAME_LEN*2+1+1+4+4)
 #define MAX_ALIAS_NAME 256
-#define MAX_FIELD_NAME (NAME_LEN+1)             /* Max colum name length +1 */
+#define MAX_FIELD_NAME (NAME_LEN+2)             /* Max colum name length +2 */
 #define MAX_SYS_VAR_LENGTH 32
 #define MAX_KEY MAX_INDEXES                     /* Max used keys */
 #define MAX_REF_PARTS 32			/* Max parts used as ref */