Commit 0c73b6e8 authored by unknown's avatar unknown

Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1

into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1

parents 663109a4 80057de5
...@@ -33,8 +33,8 @@ EXPORTS ...@@ -33,8 +33,8 @@ EXPORTS
myodbc_remove_escape myodbc_remove_escape
mysql_affected_rows mysql_affected_rows
mysql_autocommit mysql_autocommit
mysql_bind_param mysql_stmt_bind_param
mysql_bind_result mysql_stmt_bind_result
mysql_change_user mysql_change_user
mysql_character_set_name mysql_character_set_name
mysql_close mysql_close
...@@ -46,9 +46,9 @@ EXPORTS ...@@ -46,9 +46,9 @@ EXPORTS
mysql_errno mysql_errno
mysql_error mysql_error
mysql_escape_string mysql_escape_string
mysql_execute mysql_stmt_execute
mysql_fetch mysql_stmt_fetch
mysql_fetch_column mysql_stmt_fetch_column
mysql_fetch_field mysql_fetch_field
mysql_fetch_field_direct mysql_fetch_field_direct
mysql_fetch_fields mysql_fetch_fields
...@@ -78,11 +78,11 @@ EXPORTS ...@@ -78,11 +78,11 @@ EXPORTS
mysql_num_rows mysql_num_rows
mysql_odbc_escape_string mysql_odbc_escape_string
mysql_options mysql_options
mysql_param_count mysql_stmt_param_count
mysql_param_result mysql_stmt_param_metadata
mysql_ping mysql_ping
mysql_prepare mysql_prepare
mysql_get_metadata mysql_stmt_result_metadata
mysql_query mysql_query
mysql_read_query_result mysql_read_query_result
mysql_real_connect mysql_real_connect
...@@ -93,7 +93,7 @@ EXPORTS ...@@ -93,7 +93,7 @@ EXPORTS
mysql_row_seek mysql_row_seek
mysql_row_tell mysql_row_tell
mysql_select_db mysql_select_db
mysql_send_long_data mysql_stmt_send_long_data
mysql_send_query mysql_send_query
mysql_shutdown mysql_shutdown
mysql_ssl_set mysql_ssl_set
......
...@@ -2642,7 +2642,7 @@ Create_file_log_event::Create_file_log_event(const char* buf, int len, ...@@ -2642,7 +2642,7 @@ Create_file_log_event::Create_file_log_event(const char* buf, int len,
We must make copy of 'buf' as this event may have to live over a We must make copy of 'buf' as this event may have to live over a
rotate log entry when used in mysqlbinlog rotate log entry when used in mysqlbinlog
*/ */
if (!(event_buf= my_memdup(buf, len, MYF(MY_WME))) || if (!(event_buf= my_memdup((byte*)buf, len, MYF(MY_WME))) ||
(copy_log_event(event_buf, len, old_format))) (copy_log_event(event_buf, len, old_format)))
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
......
...@@ -2560,8 +2560,8 @@ QUICK_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table, TABLE_REF *ref) ...@@ -2560,8 +2560,8 @@ QUICK_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table, TABLE_REF *ref)
QUICK_RANGE *null_range; QUICK_RANGE *null_range;
*ref->null_ref_key= 1; // Set null byte then create a range *ref->null_ref_key= 1; // Set null byte then create a range
if (!(null_range= new QUICK_RANGE(ref->key_buff, ref->key_length, if (!(null_range= new QUICK_RANGE((char*)ref->key_buff, ref->key_length,
ref->key_buff, ref->key_length, (char*)ref->key_buff, ref->key_length,
EQ_RANGE))) EQ_RANGE)))
goto err; goto err;
*ref->null_ref_key= 0; // Clear null byte *ref->null_ref_key= 0; // Clear null byte
......
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