Commit 06bdbaa2 authored by calvin's avatar calvin

branches/zip: change function names in sql/mysqld.def in order

to work with 5.1.29-rc.

In 5.1.29, the following function names are changed:
  _hash_init
  hash_free
  hash_search
  hash_delete

changed to
  _my_hash_init
  my_hash_free
  my_hash_search
  my_hash_delete

Approved by:	Marko (on IM)
parent 1e66bf40
...@@ -113,8 +113,8 @@ diff -Nur sql/mysqld.def.orig sql/mysqld.def ...@@ -113,8 +113,8 @@ diff -Nur sql/mysqld.def.orig sql/mysqld.def
+ thd_make_lex_string + thd_make_lex_string
+ thd_in_lock_tables + thd_in_lock_tables
+ thd_binlog_format + thd_binlog_format
+ _hash_init + _my_hash_init
+ hash_free + my_hash_free
+ my_tmpdir + my_tmpdir
+ check_if_legal_filename + check_if_legal_filename
+ my_filename + my_filename
...@@ -127,8 +127,8 @@ diff -Nur sql/mysqld.def.orig sql/mysqld.def ...@@ -127,8 +127,8 @@ diff -Nur sql/mysqld.def.orig sql/mysqld.def
+ get_charset + get_charset
+ unpack_filename + unpack_filename
+ my_hash_insert + my_hash_insert
+ hash_search + my_hash_search
+ hash_delete + my_hash_delete
+ mysql_bin_log_file_pos + mysql_bin_log_file_pos
+ mysql_bin_log_file_name + mysql_bin_log_file_name
+ mysqld_embedded + mysqld_embedded
...@@ -216,8 +216,8 @@ diff -Nur ../old/sql/mysqld_x64.def.orig ./sql/mysqld_x64.def ...@@ -216,8 +216,8 @@ diff -Nur ../old/sql/mysqld_x64.def.orig ./sql/mysqld_x64.def
+ thd_make_lex_string + thd_make_lex_string
+ thd_in_lock_tables + thd_in_lock_tables
+ thd_binlog_format + thd_binlog_format
+ _hash_init + _my_hash_init
+ hash_free + my_hash_free
+ my_tmpdir + my_tmpdir
+ check_if_legal_filename + check_if_legal_filename
+ my_filename + my_filename
...@@ -230,8 +230,8 @@ diff -Nur ../old/sql/mysqld_x64.def.orig ./sql/mysqld_x64.def ...@@ -230,8 +230,8 @@ diff -Nur ../old/sql/mysqld_x64.def.orig ./sql/mysqld_x64.def
+ get_charset + get_charset
+ unpack_filename + unpack_filename
+ my_hash_insert + my_hash_insert
+ hash_search + my_hash_search
+ hash_delete + my_hash_delete
+ mysql_bin_log_file_pos + mysql_bin_log_file_pos
+ mysql_bin_log_file_name + mysql_bin_log_file_name
+ mysqld_embedded + mysqld_embedded
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment