Commit 542f13cf authored by unknown's avatar unknown
Browse files

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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


client/mysql.cc:
  Auto merged
myisam/mi_open.c:
  Auto merged
sql-common/client.c:
  Auto merged
parents f33566b5 3c45559d

client/mysql.cc

+4 −4
Original line number Diff line number Diff line
@@ -1520,7 +1520,7 @@ You can turn off this feature to get a quicker startup with -A\n\n"); 
      j=0;

      while ((sql_field=mysql_fetch_field(fields)))

      {

	sprintf(buf,"%s.%s",table_row[0],sql_field->name);

	sprintf(buf,"%.64s.%.64s",table_row[0],sql_field->name);

	field_names[i][j] = strdup_root(&hash_mem_root,buf);

	add_word(&ht,field_names[i][j]);

	field_names[i][num_fields+j] = strdup_root(&hash_mem_root,
@@ -2526,7 +2526,7 @@ com_connect(String *buffer, char *line) 
  {

    sprintf(buff,"Connection id:    %lu",mysql_thread_id(&mysql));

    put_info(buff,INFO_INFO);

    sprintf(buff,"Current database: %s\n",

    sprintf(buff,"Current database: %.128s\n",

	    current_db ? current_db : "*** NONE ***");

    put_info(buff,INFO_INFO);

  }

myisam/mi_open.c

+2 −3
Original line number Diff line number Diff line
@@ -148,9 +148,8 @@ MI_INFO *mi_open(const char *name, int mode, uint open_flags) 
      goto err;

    }

    /* Don't call realpath() if the name can't be a link */

    if (strcmp(name_buff, org_name))

      (void) my_readlink(index_name, org_name, MYF(0));

    else

    if (strcmp(name_buff, org_name)  ||

        my_readlink(index_name, org_name, MYF(0)) == -1)

      (void) strmov(index_name, org_name);

    (void) fn_format(data_name,org_name,"",MI_NAME_DEXT,2+4+16);

sql-common/client.c

+1 −0
Original line number Diff line number Diff line
@@ -1424,6 +1424,7 @@ mysql_init(MYSQL *mysql) 
    bzero((char*) (mysql),sizeof(*(mysql)));

  mysql->options.connect_timeout= CONNECT_TIMEOUT;

  mysql->last_used_con= mysql->next_slave= mysql->master = mysql;

  mysql->charset=default_charset_info;

  strmov(mysql->net.sqlstate, not_error_sqlstate);

  /*

    By default, we are a replication pivot. The caller must reset it