From 9c3c566fcbc4f6f1452fc7c5440890d9d2e78efc Mon Sep 17 00:00:00 2001
From: "ram@gw.mysql.r18.ru" <>
Date: Fri, 21 Jan 2005 15:14:31 +0400
Subject: A fix (bug #7261: Alter table loses temp table with
 lower_case_table_names=2).

---
 sql/sql_table.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sql')

diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index c3bfbe086f1..e01df8a3fcd 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -3231,7 +3231,8 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
     }
     /* Remove link to old table and rename the new one */
     close_temporary_table(thd,table->table_cache_key,table_name);
-    if (rename_temporary_table(thd, new_table, new_db, new_alias))
+    /* Should pass the 'new_name' as we store table name in the cache */
+    if (rename_temporary_table(thd, new_table, new_db, new_name))
     {						// Fatal error
       close_temporary_table(thd,new_db,tmp_name);
       my_free((gptr) new_table,MYF(0));
-- 
cgit v1.2.1


From b4eebbc0b6c428e15d7eb83bd8bc17032e89cc8a Mon Sep 17 00:00:00 2001
From: "tomas@poseidon.ndb.mysql.com" <>
Date: Tue, 25 Jan 2005 13:46:40 +0100
Subject: changed from using column names to column id in ndb setBound in
 ha_ndbcluster

---
 sql/ha_ndbcluster.cc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'sql')

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index c2d12ddd316..c5bb4984f40 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -1476,10 +1476,7 @@ int ha_ndbcluster::set_bounds(NdbIndexScanOperation *op,
         // Set bound if not cancelled via type -1
         if (p.bound_type != -1)
 	{
-	  char truncated_field_name[NDB_MAX_ATTR_NAME_SIZE];
-	  strnmov(truncated_field_name,field->field_name,sizeof(truncated_field_name));
-	  truncated_field_name[sizeof(truncated_field_name)-1]= '\0';
-          if (op->setBound(truncated_field_name, p.bound_type, p.bound_ptr))
+          if (op->setBound(i, p.bound_type, p.bound_ptr))
             ERR_RETURN(op->getNdbError());
 	}
       }
-- 
cgit v1.2.1


From da658b9f11bc3b2bf3dc4f1b2b2356d54324e989 Mon Sep 17 00:00:00 2001
From: "mskold@mysql.com" <>
Date: Tue, 25 Jan 2005 15:08:51 +0100
Subject: Fix for failing INSERT IGNORE in test ndb_insert

---
 sql/sql_insert.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'sql')

diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc
index 92c429bcfde..844e5e7dac2 100644
--- a/sql/sql_insert.cc
+++ b/sql/sql_insert.cc
@@ -241,7 +241,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
   error=0;
   id=0;
   thd->proc_info="update";
-  if (duplic != DUP_ERROR)
+  if (duplic != DUP_ERROR || ignore)
     table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);
   /*
     let's *try* to start bulk inserts. It won't necessary
@@ -380,7 +380,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
   table->next_number_field=0;
   thd->count_cuted_fields= CHECK_FIELD_IGNORE;
   thd->next_insert_id=0;			// Reset this if wrongly used
-  if (duplic != DUP_ERROR)
+  if (duplic != DUP_ERROR || ignore)
     table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
 
   /* Reset value of LAST_INSERT_ID if no rows where inserted */
@@ -1345,7 +1345,7 @@ bool delayed_insert::handle_inserts(void)
     info.ignore= row->ignore;
     info.handle_duplicates= row->dup;
     if (info.ignore ||
-	info.handle_duplicates == DUP_REPLACE)
+	info.handle_duplicates != DUP_ERROR)
     {
       table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);
       using_ignore=1;
@@ -1463,7 +1463,7 @@ select_insert::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
   table->next_number_field=table->found_next_number_field;
   thd->cuted_fields=0;
   if (info.ignore ||
-      info.handle_duplicates == DUP_REPLACE)
+      info.handle_duplicates != DUP_ERROR)
     table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);
   table->file->start_bulk_insert((ha_rows) 0);
   DBUG_RETURN(0);
@@ -1649,7 +1649,7 @@ select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
   restore_record(table,default_values);			// Get empty record
   thd->cuted_fields=0;
   if (info.ignore ||
-      info.handle_duplicates == DUP_REPLACE)
+      info.handle_duplicates != DUP_ERROR)
     table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);
   table->file->start_bulk_insert((ha_rows) 0);
   DBUG_RETURN(0);
-- 
cgit v1.2.1


From 6c3a4aee18e8883146833e8b28b3c56db86d77f6 Mon Sep 17 00:00:00 2001
From: "konstantin@mysql.com" <>
Date: Tue, 25 Jan 2005 17:25:46 +0300
Subject: Fix two typos in comments.

---
 sql/sql_parse.cc  | 2 +-
 sql/sql_select.cc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql')

diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 4bd6acce499..c0bcaf771a5 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -5377,7 +5377,7 @@ TABLE_LIST *st_select_lex::add_table_to_list(THD *thd,
   Initialize a new table list for a nested join
 
   SYNOPSIS
-    init_table_list()
+    init_nested_join()
     thd         current thread
 
   DESCRIPTION
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index d6e725341fe..dd1ac332df9 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -12962,7 +12962,7 @@ static void print_join(THD *thd, String *str, List<TABLE_LIST> *tables)
   {
     TABLE_LIST *curr= *tbl;
     if (curr->outer_join)
-      str->append(" left join ", 11); // MySQL converg right to left joins
+      str->append(" left join ", 11); // MySQL converts right to left joins
     else if (curr->straight)
       str->append(" straight_join ", 15);
     else
-- 
cgit v1.2.1


From 37168015cd4a2135cfcfcd71478c066759fffd6a Mon Sep 17 00:00:00 2001
From: "monty@mysql.com" <>
Date: Tue, 25 Jan 2005 21:27:51 +0200
Subject: Cleanups during review

---
 sql/mysqld.cc     | 9 ++++-----
 sql/sql_select.cc | 7 -------
 2 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'sql')

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 6d647b6edf0..c5ed516570a 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2915,12 +2915,11 @@ You should consider changing lower_case_table_names to 1 or 2",
              (test_if_case_insensitive(mysql_real_data_home) == 1)))
   {
     if (global_system_variables.log_warnings)
-      sql_print_warning("\
-You have forced lower_case_table_names to 2 through a command-line \
-option, even though your file system '%s' is case sensitive.  This means \
-that you can create a table that you can then no longer access. \
-You should consider changing lower_case_table_names to 0.",
+      sql_print_warning("lower_case_table_names was set to 2, even though your "
+                        "the file system '%s' is case sensitive.  Now setting "
+                        "lower_case_table_names to 0 to avoid future problems.",
 			mysql_real_data_home);
+    lower_case_table_names= 0;
   }
 
   select_thread=pthread_self();
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index a53b878cf6c..e956d71a4be 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2828,16 +2828,9 @@ find_best(JOIN *join,table_map rest_tables,uint idx,double record_count,
 		    x = used key parts (1 <= x <= c)
 		  */
 		  double rec_per_key;
-#if 0
-		  if (!(rec_per_key=(double)
-			keyinfo->rec_per_key[keyinfo->key_parts-1]))
-		    rec_per_key=(double) s->records/rec+1;
-#else
                   rec_per_key= keyinfo->rec_per_key[keyinfo->key_parts-1] ?
 		    (double) keyinfo->rec_per_key[keyinfo->key_parts-1] :
 		    (double) s->records/rec+1;   
-#endif
-
 		  if (!s->records)
 		    tmp=0;
 		  else if (rec_per_key/(double) s->records >= 0.01)
-- 
cgit v1.2.1


From 7084b494c44eb2d815652640381c8930981dc435 Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Wed, 26 Jan 2005 08:57:43 +0100
Subject: innobase/include/univ.i     remove a change that broke the test

---
 sql/item_create.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sql')

diff --git a/sql/item_create.cc b/sql/item_create.cc
index 99db184e71f..d959a6f393a 100644
--- a/sql/item_create.cc
+++ b/sql/item_create.cc
@@ -377,13 +377,14 @@ Item *create_func_space(Item *a)
   {
     uint dummy_errors;
     sp= new Item_string("",0,cs);
-    sp->str_value.copy(" ", 1, &my_charset_latin1, cs, &dummy_errors);
+    if (sp)
+      sp->str_value.copy(" ", 1, &my_charset_latin1, cs, &dummy_errors);
   }
   else
   {
     sp= new Item_string(" ",1,cs);
   }
-  return new Item_func_repeat(sp, a);
+  return sp ? new Item_func_repeat(sp, a) : 0;
 }
 
 Item *create_func_soundex(Item* a)
-- 
cgit v1.2.1


From 5779a6a576100fa008f51bcd9ad50bce6007c037 Mon Sep 17 00:00:00 2001
From: "tomas@poseidon.ndb.mysql.com" <>
Date: Wed, 26 Jan 2005 11:31:46 +0100
Subject: Bug#8101  unique indexes which attribute are _not_ specified in the
 order of the table does not work

---
 sql/ha_ndbcluster.cc | 54 +++++++++++++++++++++++++++++++++++++++++++++++-----
 sql/ha_ndbcluster.h  |  1 +
 2 files changed, 50 insertions(+), 5 deletions(-)

(limited to 'sql')

diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index c5bb4984f40..437b5ebcdf7 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -765,6 +765,42 @@ int ha_ndbcluster::get_metadata(const char *path)
   DBUG_RETURN(build_index_list(table, ILBP_OPEN));  
 }
 
+static int fix_unique_index_attr_order(NDB_INDEX_DATA &data,
+				       const NDBINDEX *index,
+				       KEY *key_info)
+{
+  DBUG_ENTER("fix_unique_index_attr_order");
+  unsigned sz= index->getNoOfIndexColumns();
+
+  if (data.unique_index_attrid_map)
+    my_free((char*)data.unique_index_attrid_map, MYF(0));
+  data.unique_index_attrid_map= (unsigned char*)my_malloc(sz,MYF(MY_WME));
+
+  KEY_PART_INFO* key_part= key_info->key_part;
+  KEY_PART_INFO* end= key_part+key_info->key_parts;
+  DBUG_ASSERT(key_info->key_parts == sz);
+  for (unsigned i= 0; key_part != end; key_part++, i++) 
+  {
+    const char *field_name= key_part->field->field_name;
+    unsigned name_sz= strlen(field_name);
+    if (name_sz >= NDB_MAX_ATTR_NAME_SIZE)
+      name_sz= NDB_MAX_ATTR_NAME_SIZE-1;
+#ifndef DBUG_OFF
+   data.unique_index_attrid_map[i]= 255;
+#endif
+    for (unsigned j= 0; j < sz; j++)
+    {
+      const NdbDictionary::Column *c= index->getColumn(j);
+      if (strncmp(field_name, c->getName(), name_sz) == 0)
+      {
+	data.unique_index_attrid_map[i]= j;
+	break;
+      }
+    }
+    DBUG_ASSERT(data.unique_index_attrid_map[i] != 255);
+  }
+  DBUG_RETURN(0);
+}
 
 int ha_ndbcluster::build_index_list(TABLE *tab, enum ILBP phase)
 {
@@ -839,7 +875,8 @@ int ha_ndbcluster::build_index_list(TABLE *tab, enum ILBP phase)
       const NDBINDEX *index= dict->getIndex(unique_index_name, m_tabname);
       if (!index) DBUG_RETURN(1);
       m_index[i].unique_index= (void *) index;
-    }      
+      error= fix_unique_index_attr_order(m_index[i], index, key_info);
+    }
   }
   
   DBUG_RETURN(error);
@@ -897,6 +934,11 @@ void ha_ndbcluster::release_metadata()
   {
     m_index[i].unique_index= NULL;      
     m_index[i].index= NULL;      
+    if (m_index[i].unique_index_attrid_map)
+    {
+      my_free((char *)m_index[i].unique_index_attrid_map, MYF(0));
+      m_index[i].unique_index_attrid_map= NULL;
+    }
   }
 
   DBUG_VOID_RETURN;
@@ -1209,7 +1251,8 @@ int ha_ndbcluster::unique_index_read(const byte *key,
 
   for (i= 0; key_part != end; key_part++, i++) 
   {
-    if (set_ndb_key(op, key_part->field, i, 
+    if (set_ndb_key(op, key_part->field,
+		    m_index[active_index].unique_index_attrid_map[i], 
 		    key_part->null_bit ? key_ptr + 1 : key_ptr))
       ERR_RETURN(trans->getNdbError());
     key_ptr+= key_part->store_length;
@@ -3836,9 +3879,10 @@ ha_ndbcluster::ha_ndbcluster(TABLE *table_arg):
 
   for (i= 0; i < MAX_KEY; i++)
   {
-    m_index[i].type= UNDEFINED_INDEX;   
-    m_index[i].unique_index= NULL;      
-    m_index[i].index= NULL;      
+    m_index[i].type= UNDEFINED_INDEX;
+    m_index[i].unique_index= NULL;
+    m_index[i].index= NULL;
+    m_index[i].unique_index_attrid_map= NULL;
   }
 
   DBUG_VOID_RETURN;
diff --git a/sql/ha_ndbcluster.h b/sql/ha_ndbcluster.h
index 15e61a93574..07b305bad3e 100644
--- a/sql/ha_ndbcluster.h
+++ b/sql/ha_ndbcluster.h
@@ -52,6 +52,7 @@ typedef struct ndb_index_data {
   NDB_INDEX_TYPE type;
   void *index;
   void *unique_index;
+  unsigned char *unique_index_attrid_map;
 } NDB_INDEX_DATA;
 
 typedef struct st_ndbcluster_share {
-- 
cgit v1.2.1


From f995a526b1f244c1303c3d4dc02cefac7738543d Mon Sep 17 00:00:00 2001
From: "ram@gw.mysql.r18.ru" <>
Date: Wed, 26 Jan 2005 15:11:55 +0400
Subject: a fix (bug #8129: help.test fails using --ps-protocol)

---
 sql/sql_help.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sql')

diff --git a/sql/sql_help.cc b/sql/sql_help.cc
index 7bf28a439b6..ff2f5bf4992 100644
--- a/sql/sql_help.cc
+++ b/sql/sql_help.cc
@@ -559,7 +559,8 @@ SQL_SELECT *prepare_simple_select(THD *thd, Item *cond, TABLE_LIST *tables,
   if (!cond->fixed)
     cond->fix_fields(thd, tables, &cond);	// can never fail
   SQL_SELECT *res= make_select(table,0,0,cond,error);
-  if (*error || (res && res->check_quick(thd, 0, HA_POS_ERROR)))
+  if (*error || (res && res->check_quick(thd, 0, HA_POS_ERROR)) ||
+      (res->quick && res->quick->reset()))
   {
     delete res;
     res=0;
-- 
cgit v1.2.1


From 4453a6243e6c2db7d92f0de544a5f8f46b05ad04 Mon Sep 17 00:00:00 2001
From: "ram@gw.mysql.r18.ru" <>
Date: Wed, 26 Jan 2005 16:02:19 +0400
Subject: after review fixup (bug #8129: help.test fails using --ps-protocol)

---
 sql/sql_help.cc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'sql')

diff --git a/sql/sql_help.cc b/sql/sql_help.cc
index ff2f5bf4992..759b535da53 100644
--- a/sql/sql_help.cc
+++ b/sql/sql_help.cc
@@ -558,6 +558,10 @@ SQL_SELECT *prepare_simple_select(THD *thd, Item *cond, TABLE_LIST *tables,
 {
   if (!cond->fixed)
     cond->fix_fields(thd, tables, &cond);	// can never fail
+
+  /* Assume that no indexes cover all required fields */
+  table->used_keys.clear_all();
+
   SQL_SELECT *res= make_select(table,0,0,cond,error);
   if (*error || (res && res->check_quick(thd, 0, HA_POS_ERROR)) ||
       (res->quick && res->quick->reset()))
-- 
cgit v1.2.1


From 8828884f4c1230e80650141f36144e63d03c4b66 Mon Sep 17 00:00:00 2001
From: "bar@mysql.com" <>
Date: Wed, 26 Jan 2005 16:34:09 +0400
Subject: CSC#4385: slow sorting for UTF8 large table: my_strnxfrm_utf8 now
 requires 2 bytes per character in filesort key, instead of 3 bytes per
 character. Shorter filesort keys make sorting faster.

---
 sql/filesort.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sql')

diff --git a/sql/filesort.cc b/sql/filesort.cc
index 0e9fa8c79ed..1665358dbf0 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -1187,7 +1187,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length, bool *multi_byte_charset)
 	{
 	  sortorder->need_strxnfrm= 1;
 	  *multi_byte_charset= 1;
-	  sortorder->length= sortorder->length*cs->strxfrm_multiply;
+          sortorder->length= cs->coll->strnxfrmlen(cs, sortorder->length);
 	}
       }
       if (sortorder->field->maybe_null())
@@ -1200,7 +1200,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length, bool *multi_byte_charset)
 	sortorder->length=sortorder->item->max_length;
 	if (use_strnxfrm((cs=sortorder->item->collation.collation)))
 	{ 
-	  sortorder->length= sortorder->length*cs->strxfrm_multiply;
+          sortorder->length= cs->coll->strnxfrmlen(cs, sortorder->length);
 	  sortorder->need_strxnfrm= 1;
 	  *multi_byte_charset= 1;
 	}
-- 
cgit v1.2.1


From 3b2bf2f512a62ae5b2c9e06e38026033b177bed9 Mon Sep 17 00:00:00 2001
From: "georg@beethoven.site" <>
Date: Wed, 26 Jan 2005 15:19:20 +0100
Subject: Fixes for windows compilation bugs (After review of cs georg:1.1800
 by Monty)

---
 sql/field.h      | 2 +-
 sql/item_sum.cc  | 6 +++---
 sql/key.cc       | 4 ++--
 sql/opt_range.cc | 2 +-
 sql/sql_acl.cc   | 4 ++--
 sql/table.cc     | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'sql')

diff --git a/sql/field.h b/sql/field.h
index fd1ef09d14f..84d71afcd6f 100644
--- a/sql/field.h
+++ b/sql/field.h
@@ -1228,7 +1228,7 @@ public:
   int cmp(const char *a, const char *b)
   { return cmp_binary(a, b); }
   int key_cmp(const byte *a, const byte *b)
-  { return cmp_binary(a, b); }
+  { return cmp_binary((char *) a, (char *) b); }
   int key_cmp(const byte *str, uint length);
   int cmp_offset(uint row_offset);
   void get_key_image(char *buff, uint length, imagetype type);
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index be89aa3f86d..29837c3afbd 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -1234,7 +1234,7 @@ int composite_key_cmp(void* arg, byte* key1, byte* key2)
   {
     Field* f = *field;
     int len = *lengths++;
-    int res = f->cmp(key1, key2);
+    int res = f->cmp((char *) key1, (char *) key2);
     if (res)
       return res;
     key1 += len;
@@ -1688,7 +1688,7 @@ int group_concat_key_cmp_with_distinct(void* arg, byte* key1,
     {
       int res;
       uint offset= (uint) (field->ptr - record);
-      if ((res= field->cmp(key1 + offset, key2 + offset)))
+      if ((res= field->cmp((char *) key1 + offset, (char *) key2 + offset)))
 	return res;
     }
   }
@@ -1722,7 +1722,7 @@ int group_concat_key_cmp_with_order(void* arg, byte* key1, byte* key2)
     {
       int res;
       uint offset= (uint) (field->ptr - record);
-      if ((res= field->cmp(key1 + offset, key2 + offset)))
+      if ((res= field->cmp((char *) key1 + offset, (char *) key2 + offset)))
         return (*order_item)->asc ? res : -res;
     }
   }
diff --git a/sql/key.cc b/sql/key.cc
index aec294e370a..c5ed60b129c 100644
--- a/sql/key.cc
+++ b/sql/key.cc
@@ -135,7 +135,7 @@ void key_copy(byte *to_key, byte *from_record, KEY *key_info, uint key_length)
     {
       key_length-= HA_KEY_BLOB_LENGTH;
       length= min(key_length, key_part->length);
-      key_part->field->get_key_image(to_key, length, Field::itRAW);
+      key_part->field->get_key_image((char *) to_key, length, Field::itRAW);
       to_key+= HA_KEY_BLOB_LENGTH;
     }
     else
@@ -217,7 +217,7 @@ void key_restore(byte *to_record, byte *from_key, KEY *key_info,
     {
       key_length-= HA_KEY_BLOB_LENGTH;
       length= min(key_length, key_part->length);
-      key_part->field->set_key_image(from_key, length);
+      key_part->field->set_key_image((char *) from_key, length);
       from_key+= HA_KEY_BLOB_LENGTH;
     }
     else
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index c3b84564504..e5799bfd509 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -1891,7 +1891,7 @@ double get_sweep_read_cost(const PARAM *param, ha_rows records)
   else
   {
     double n_blocks=
-      ceil((double)param->table->file->data_file_length / IO_SIZE);
+      ceil(ulonglong2double(param->table->file->data_file_length) / IO_SIZE);
     double busy_blocks=
       n_blocks * (1.0 - pow(1.0 - 1.0/n_blocks, rows2double(records)));
     if (busy_blocks < 1.0)
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc
index f9d95b2cde5..71d042eda02 100644
--- a/sql/sql_acl.cc
+++ b/sql/sql_acl.cc
@@ -1494,12 +1494,12 @@ static bool update_user_table(THD *thd, const char *host, const char *user,
     DBUG_RETURN(1); /* purecov: deadcode */
   table->field[0]->store(host,(uint) strlen(host), system_charset_info);
   table->field[1]->store(user,(uint) strlen(user), system_charset_info);
-  key_copy(user_key, table->record[0], table->key_info,
+  key_copy((byte *) user_key, table->record[0], table->key_info,
            table->key_info->key_length);
 
   table->file->extra(HA_EXTRA_RETRIEVE_ALL_COLS);
   if (table->file->index_read_idx(table->record[0], 0,
-				  user_key, table->key_info->key_length,
+				  (byte *) user_key, table->key_info->key_length,
 				  HA_READ_KEY_EXACT))
   {
     my_message(ER_PASSWORD_NO_MATCH, ER(ER_PASSWORD_NO_MATCH),
diff --git a/sql/table.cc b/sql/table.cc
index 82ad32341c0..69a132329c0 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -305,7 +305,7 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
   if (!(record= (char *) alloc_root(&outparam->mem_root,
                                     rec_buff_length * records)))
     goto err;                                   /* purecov: inspected */
-  share->default_values= record;
+  share->default_values= (byte *) record;
   if (my_pread(file,(byte*) record, (uint) share->reclength,
 	       (ulong) (uint2korr(head+6)+
                         ((uint2korr(head+14) == 0xffff ?
@@ -320,9 +320,9 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
   }
   else
   {
-    outparam->record[0]= record+ rec_buff_length;
+    outparam->record[0]= (byte *) record+ rec_buff_length;
     if (records > 2)
-      outparam->record[1]= record+ rec_buff_length*2;
+      outparam->record[1]= (byte *) record+ rec_buff_length*2;
     else
       outparam->record[1]= outparam->record[0];   // Safety
   }
-- 
cgit v1.2.1


From c38886b20c8f8e74304f1c5a507dbc4635b53da2 Mon Sep 17 00:00:00 2001
From: "ram@gw.mysql.r18.ru" <>
Date: Wed, 26 Jan 2005 18:37:49 +0400
Subject: timed_mutexes moved to include/my_sys.h and mysys/my_static.c to
 avoid linking problems referring to the variable from .c programs.

---
 sql/mysql_priv.h | 1 -
 sql/mysqld.cc    | 1 -
 2 files changed, 2 deletions(-)

(limited to 'sql')

diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h
index 5a222a1ce10..0349d9a635f 100644
--- a/sql/mysql_priv.h
+++ b/sql/mysql_priv.h
@@ -1002,7 +1002,6 @@ extern ulong table_cache_size;
 extern ulong max_connections,max_connect_errors, connect_timeout;
 extern ulong slave_net_timeout;
 extern ulong max_user_connections;
-extern my_bool timed_mutexes;
 extern ulong what_to_log,flush_time;
 extern ulong query_buff_size, thread_stack,thread_stack_min;
 extern ulong binlog_cache_size, max_binlog_cache_size, open_files_limit;
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 94eb34954ba..e99acd7ed82 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -335,7 +335,6 @@ ulong binlog_cache_use= 0, binlog_cache_disk_use= 0;
 ulong max_connections,max_used_connections,
       max_connect_errors, max_user_connections = 0;
 ulong thread_id=1L,current_pid;
-my_bool timed_mutexes= 0;
 ulong slow_launch_threads = 0, sync_binlog_period;
 ulong expire_logs_days = 0;
 ulong rpl_recovery_rank=0;
-- 
cgit v1.2.1