WL#8206: Intoduce separate error code range for 5.7

Post-push fix: Fix unit tests failing in PB2.

Author: jhauglid

sql/derror.h

@@ -17,6 +17,9 @@
 #define DERROR_INCLUDED
 
 #include "my_global.h"                          /* uint */
+#ifdef EXTRA_CODE_FOR_UNIT_TESTING
+#include "mysqld_error.h"
+#endif
 
 class THD;
 
@@ -33,6 +36,25 @@ class MY_LOCALE_ERRMSGS
   /** Return error message string for a given error number. */
   const char *lookup(int mysql_errno);
 
+#ifdef EXTRA_CODE_FOR_UNIT_TESTING
+  bool replace_msg(int mysql_errno, const char *new_msg)
+  {
+    int offset= 0; // Position where the current section starts in the array.
+    int num_sections= sizeof(errmsg_section_start) /
+      sizeof(errmsg_section_start[0]);
+    for (int i= 0; i < num_sections; i++)
+    {
+      if (mysql_errno < (errmsg_section_start[i] + errmsg_section_size[i]))
+      {
+        errmsgs[mysql_errno - errmsg_section_start[i] + offset]= new_msg;
+        return false;
+      }
+      offset+= errmsg_section_size[i];
+    }
+    return true;
+  }
+#endif
+
   /** Has the error message file been sucessfully loaded? */
   bool is_loaded() const { return errmsgs != NULL; }
 

unittest/gunit/CMakeLists.txt

@@ -237,7 +237,6 @@ MESSAGE(STATUS "GTEST_LIBRARIES:${GTEST_LIBRARIES}")
 
 # Add some defines.
 ADD_DEFINITIONS(-DMYSQL_SERVER -DEXTRA_CODE_FOR_UNIT_TESTING)
-ADD_DEFINITIONS(-DERRMSG_DIR=\"${CMAKE_BINARY_DIR}/sql/share/\")
 
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
 

unittest/gunit/explain_filename-t.cc

@@ -35,10 +35,21 @@ class PartitionTest : public ::testing::Test
 protected:
   virtual void SetUp()
   {
+    // Save global settings.
     m_charset= system_charset_info;
     m_locale= my_default_lc_messages;
+
     system_charset_info    = &my_charset_utf8_bin;
     my_default_lc_messages = &my_locale_en_US;
+
+    /* Populate the necessary error messages */
+    MY_LOCALE_ERRMSGS *errmsgs= my_default_lc_messages->errmsgs;
+    EXPECT_FALSE(errmsgs->replace_msg(ER_DATABASE_NAME,     "Database"));
+    EXPECT_FALSE(errmsgs->replace_msg(ER_TABLE_NAME,        "Table"));
+    EXPECT_FALSE(errmsgs->replace_msg(ER_PARTITION_NAME,    "Partition"));
+    EXPECT_FALSE(errmsgs->replace_msg(ER_SUBPARTITION_NAME, "Subpartition"));
+    EXPECT_FALSE(errmsgs->replace_msg(ER_TEMPORARY_NAME,    "Temporary"));
+    EXPECT_FALSE(errmsgs->replace_msg(ER_RENAMED_NAME,      "Renamed"));
   }
 
   virtual void TearDown()

unittest/gunit/test_utils.cc

@@ -48,7 +48,6 @@ void setup_server_for_unit_tests()
   mysql_mutex_init(key_LOCK_error_log, &LOCK_error_log, MY_MUTEX_INIT_FAST);
   system_charset_info= &my_charset_utf8_general_ci;
   sys_var_init();
-  strcpy(lc_messages_dir, ERRMSG_DIR);
   init_common_variables();
   my_init_signals();
   randominit(&sql_rand, 0, 0);