Commit 78f2e7b5 authored by unknown's avatar unknown
Browse files

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

into mysql.com:/home/my/mysql-4.1


libmysql/libmysql.c:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
parents 2059908b ba3540cc

libmysql/libmysql.c

+5 −2
Original line number Diff line number Diff line
@@ -3947,8 +3947,11 @@ my_bool STDCALL mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *bind) 
  /*

    We only need to check that stmt->field_count - if it is not null

    stmt->bind was initialized in mysql_stmt_prepare

    stmt->bind overlaps with bind if mysql_stmt_bind_param

    is called from mysql_stmt_store_result.

  */



  if (stmt->bind != bind)

    memcpy((char*) stmt->bind, (char*) bind, sizeof(MYSQL_BIND) * bind_count);



  for (param= stmt->bind, end= param + bind_count, field= stmt->fields ;

sql/ha_blackhole.cc

+2 −1
Original line number Diff line number Diff line
@@ -129,8 +129,9 @@ THR_LOCK_DATA **ha_blackhole::store_lock(THD *thd, 
                                         THR_LOCK_DATA **to,

                                         enum thr_lock_type lock_type)

{

  if (lock_type != TL_IGNORE && lock.type == TL_UNLOCK)

    lock.type=lock_type;

  *to++= &lock;



  return to;

}

sql/share/danish/errmsg.txt

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ character-set=latin1 
"Key reference and table reference don't match",

"Operand should contain %d column(s)",

"Subquery returns more than 1 row",

"Unknown prepared statement handler (%ld) given to %s",

"Unknown prepared statement handler (%.*s) given to %s",

"Help database is corrupt or does not exist",

"Cyclic reference on subqueries",

"Converting column '%s' from %s to %s",

sql/share/serbian/errmsg.txt

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ character-set=cp1250 
"Key reference and table reference don't match",

"Operand should contain %d column(s)",

"Subquery returns more than 1 row",

"Unknown prepared statement handler (%ld) given to %s",

"Unknown prepared statement handler (%.*s) given to %s",

"Help database is corrupt or does not exist",

"Cyclic reference on subqueries",

"Converting column '%s' from %s to %s",

sql/sql_base.cc

+1 −1
Original line number Diff line number Diff line
@@ -2522,7 +2522,7 @@ bool get_key_map_from_key_list(key_map *map, TABLE *table, 
    if ((pos= find_type(&table->keynames, name->ptr(), name->length(), 1)) <=

	0)

    {

      my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(),

      my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr_safe(),

	       table->real_name);

      map->set_all();

      return 1;