MDEV-8334: Rename utf8 to utf8mb310.6-rucha-mdev-8334

This patch changes the main name of 3 byte character set from utf8 to
utf8mb3. New old_mode UTF8_IS_UTF8MB3 is added and set TRUE by default,
so that utf8 would mean utf8mb3. If not set, utf8 would mean utf8mb4.

1 files changed, 1 insertions, 1 deletions

diff --git a/sql/sp.h b/sql/sp.h
index e92525e1930..44c8d9ca751 100644
--- a/sql/sp.h
+++ b/sql/sp.h
@@ -662,7 +662,7 @@ bool load_charset(MEM_ROOT *mem_root,
                   CHARSET_INFO *dflt_cs,
                   CHARSET_INFO **cs);
 
-bool load_collation(MEM_ROOT *mem_root,
+bool load_collation(THD *thd,MEM_ROOT *mem_root,
                     Field *field,
                     CHARSET_INFO *dflt_cl,
                     CHARSET_INFO **cl);