Commit fd17c119 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

Merge work.mysql.com:/home/bk/mysql 

into mysql.sashanet.com:/home/sasha/src/bk/mysql
parents 1157c688 2b05ed9d

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -173,3 +173,4 @@ mysql-test/var/lib/test/elt_ck2.frm 
mysql-test/var/lib/test/elt_ck2.MYD

mysql-test/var/lib/test/elt_ck2.MYI

repl-tests/test-repl-ts/repl-timestamp.master.reject

client/.mysqladmin.c.swp

sql/item_strfunc.cc

+10 −0
Original line number Diff line number Diff line
@@ -309,6 +309,16 @@ void Item_func_concat_ws::fix_length_and_dec() 
    max_length=MAX_BLOB_WIDTH;

    maybe_null=1;

  }

  used_tables_cache|=separator->used_tables();

  const_item_cache&=separator->const_item();

}



void Item_func_concat_ws::update_used_tables()

{

  Item_func::update_used_tables();

  separator->update_used_tables();

  used_tables_cache|=separator->used_tables();

  const_item_cache&=separator->const_item();

}

sql/item_strfunc.h

+7 −1
Original line number Diff line number Diff line
@@ -69,6 +69,12 @@ class Item_func_concat_ws :public Item_str_func 
  ~Item_func_concat_ws() { delete separator; }

  String *val_str(String *);

  void fix_length_and_dec();

  void update_used_tables();

  bool fix_fields(THD *thd,struct st_table_list *tlist)

  {

    return (separator->fix_fields(thd,tlist)

	    || Item_func::fix_fields(thd,tlist));

  }

 const char *func_name() const { return "concat_ws"; }

};

sql/mini_client.cc

+5 −0
Original line number Diff line number Diff line
@@ -371,6 +371,11 @@ char * STDCALL mc_mysql_error(MYSQL *mysql) 
  return (mysql)->net.last_error;

}



int STDCALL mc_mysql_errno(MYSQL *mysql)

{

  return (mysql)->net.last_errno;

}



my_bool STDCALL mc_mysql_reconnect(MYSQL *mysql)

{

  MYSQL tmp_mysql;

sql/mini_client.h

+2 −0
Original line number Diff line number Diff line
@@ -39,7 +39,9 @@ uint STDCALL 
mc_net_safe_read(MYSQL *mysql);



char * STDCALL mc_mysql_error(MYSQL *mysql);

int STDCALL mc_mysql_errno(MYSQL *mysql);

my_bool STDCALL mc_mysql_reconnect(MYSQL* mysql);





#endif