WL#5030: Splitting mysql_priv.h

Removing traces of mysql_priv.h from comments and other
non-source files that were missed before.

Makefile.am

@@ -259,8 +259,6 @@ test-full-qa:
 
 #
 # Headers which need to be checked for abi/api compatibility.
-# API_PREPROCESSOR_HEADER will be used until mysql_priv.h stablizes
-# after which TEST_PREPROCESSOR_HEADER will be used.
 #
 
 API_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql/plugin.h \
@@ -268,9 +266,6 @@ API_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql/plugin.h \
 			$(top_srcdir)/include/mysql/psi/psi_abi_v1.h \
 			$(top_srcdir)/include/mysql/psi/psi_abi_v2.h
 
-TEST_PREPROCESSOR_HEADER = $(API_PREPROCESSOR_HEADER) \
-			$(top_srcdir)/sql/mysql_priv.h
-
 #
 # Rules for checking that the abi/api has not changed.
 #
@@ -311,8 +306,7 @@ TEST_PREPROCESSOR_HEADER = $(API_PREPROCESSOR_HEADER) \
 abi_check:	$(API_PREPROCESSOR_HEADER)
 	$(MAKE) abi_headers="$^" do_abi_check
 
-abi_check_all:	$(TEST_PREPROCESSOR_HEADER)
-	$(MAKE) abi_headers="$^" do_abi_check
+abi_check_all:	abi_check 
 
 do_abi_check:
 	set -ex; \

cmake/abi_check.cmake

@@ -14,9 +14,8 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
  
 #
-# Headers which need to be checked for abi/api compatibility.
-# API_PREPROCESSOR_HEADER will be used until mysql_priv.h stablizes
-# after which TEST_PREPROCESSOR_HEADER will be used.
+# Headers which need to be checked for abi/api compatibility are in
+# API_PREPROCESSOR_HEADER.
 #
 # We use gcc specific preprocessing command and sed/diff, so it will 
 # only be run  on Unix and only if gcc is used.
@@ -34,11 +33,6 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SYSTEM_NAME MATCHES "Linux")
     ${CMAKE_SOURCE_DIR}/include/mysql/psi/psi_abi_v2.h
   )
 
-  SET(TEST_PREPROCESSOR_HEADER 
-    ${CMAKE_SOURCE_DIR}/sql/mysql_priv.h
-  )
-
-
   ADD_CUSTOM_TARGET(abi_check ALL
   COMMAND ${CMAKE_COMMAND} 
     -DCOMPILER=${COMPILER}
@@ -54,7 +48,7 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SYSTEM_NAME MATCHES "Linux")
     -DCMAKE_C_COMPILER=${COMPILER} 
     -DCMAKE_SOURCE_DIR=${CMAKE_SOURCE_DIR}
     -DCMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}
-    "-DABI_HEADERS=${TEST_PREPROCESSOR_HEADER}"
+    "-DABI_HEADERS=${API_PREPROCESSOR_HEADER}"
     -P ${CMAKE_SOURCE_DIR}/cmake/scripts/do_abi_check.cmake
     VERBATIM
   )

include/mysql/innodb_priv.h

@@ -24,12 +24,14 @@ class THD;
 
 uint filename_to_tablename(const char *from, char *to, uint to_length);
 int get_quote_char_for_identifier(THD *thd, const char *name, uint length);
+bool schema_table_store_record(THD *thd, TABLE *table);
+void localtime_to_TIME(MYSQL_TIME *to, struct tm *from);
 bool check_global_access(THD *thd, ulong want_access);
-
 uint strconvert(CHARSET_INFO *from_cs, const char *from,
                 CHARSET_INFO *to_cs, char *to, uint to_length,
                 uint *errors);
 void sql_print_error(const char *format, ...);
 
 
+
 #endif /* INNODB_PRIV_INCLUDED */

sql/share/errmsg-utf8.txt

@@ -5927,7 +5927,7 @@ ER_DROP_INDEX_FK
         eng "Cannot drop index '%-.192s': needed in a foreign key constraint"
         ger "Kann Index '%-.192s' nicht löschen: wird für einen Fremdschlüssel benötigt"
 # When using this error message, use the ER_WARN_DEPRECATED_SYNTAX error
-# code.  See, for example, code in mysql_priv.h.
+# code.
 ER_WARN_DEPRECATED_SYNTAX_WITH_VER  
         eng  "The syntax '%s' is deprecated and will be removed in MySQL %s. Please use %s instead"
         ger "Die Syntax '%s' ist veraltet und wird in MySQL %s entfernt. Bitte benutzen Sie statt dessen %s"
@@ -6173,7 +6173,7 @@ ER_FUNC_INEXISTENT_NAME_COLLISION 42000
   eng "FUNCTION %s does not exist. Check the 'Function Name Parsing and Resolution' section in the Reference Manual"
 
 # When updating these, please update EXPLAIN_FILENAME_MAX_EXTRA_LENGTH in
-# mysql_priv.h with the new maximal additional length for explain_filename.
+# sql_table.h with the new maximal additional length for explain_filename.
 ER_DATABASE_NAME
   eng "Database"
   swe "Databas"

sql/sql_priv.h

@@ -23,8 +23,8 @@
   except the part which must be in the server and in the client.
 */
 
-#ifndef MYSQL_PRIV_H
-#define MYSQL_PRIV_H
+#ifndef SQL_PRIV_INCLUDED
+#define SQL_PRIV_INCLUDED
 
 #ifndef MYSQL_CLIENT
 
@@ -262,4 +262,4 @@ inline int hexchar_to_int(char c)
 
 #endif /* MYSQL_CLIENT */
 
-#endif /* MYSQL_PRIV_H */
+#endif /* SQL_PRIV_INCLUDED */

storage/innobase/handler/ha_innodb.cc

@@ -114,8 +114,6 @@ extern "C" {
 # endif /* MYSQL_PLUGIN_IMPORT */
 
 #if MYSQL_VERSION_ID < 50124
-/* this is defined in mysql_priv.h inside #ifdef MYSQL_SERVER
-but we need it here */
 bool check_global_access(THD *thd, ulong want_access);
 #endif /* MYSQL_VERSION_ID < 50124 */
 

storage/innobase/handler/i_s.cc

@@ -109,11 +109,6 @@ time_t			MYSQL_TYPE_DATETIME
 ---------------------------------
 */
 
-/* XXX these are defined in mysql_priv.h inside #ifdef MYSQL_SERVER */
-bool schema_table_store_record(THD *thd, TABLE *table);
-void localtime_to_TIME(MYSQL_TIME *to, struct tm *from);
-bool check_global_access(THD *thd, ulong want_access);
-
 /*******************************************************************//**
 Common function to fill any of the dynamic tables:
 INFORMATION_SCHEMA.innodb_trx