Commit 3d0f9d96 authored by unknown's avatar unknown
Browse files

Fixed during review of new pulled code 


extra/perror.c:
  Use strmov() instead of strcpy()
  Indentation fixes
sql/sql_table.cc:
  Revert back part of the old code as the new code didn't use mysql_data_home, which would have caused problems in the embedded server
sql/sql_update.cc:
  Ensure that used_index is always set (It has to be set because it's value is tested if order != 0)
parent 613c2f68

extra/perror.c

+8 −6
Original line number Diff line number Diff line
@@ -215,10 +215,12 @@ int main(int argc,char *argv[]) 
    */

    msg= strerror(10000);



    /* allocate a buffer for unknown_error since strerror always returns the same pointer 

      on some platforms such as Windows */

    /*

      Allocate a buffer for unknown_error since strerror always returns

      the same pointer on some platforms such as Windows

    */

    unknown_error= malloc(strlen(msg)+1);

    strcpy( unknown_error, msg );

    strmov(unknown_error, msg);



    for ( ; argc-- > 0 ; argv++)

    {

sql/sql_table.cc

+7 −2
Original line number Diff line number Diff line
@@ -2272,7 +2272,10 @@ int mysql_create_like_table(THD* thd, TABLE_LIST* table, 
    strxmov(src_path, (*tmp_table)->path, reg_ext, NullS);

  else

  {

    fn_format( src_path, src_table, src_db, reg_ext, MYF(MY_UNPACK_FILENAME));

    strxmov(src_path, mysql_data_home, "/", src_db, "/", src_table,

	    reg_ext, NullS);

    /* Resolve symlinks (for windows) */

    fn_format(src_path, src_path, "", "", MYF(MY_UNPACK_FILENAME));

    if (access(src_path, F_OK))

    {

      my_error(ER_BAD_TABLE_ERROR, MYF(0), src_table);
@@ -2299,7 +2302,9 @@ int mysql_create_like_table(THD* thd, TABLE_LIST* table, 
  }

  else

  {

    fn_format( dst_path, table_name, db, reg_ext, MYF(MY_UNPACK_FILENAME));

    strxmov(dst_path, mysql_data_home, "/", db, "/", table_name,

	    reg_ext, NullS);

    fn_format(dst_path, dst_path, "", "", MYF(MY_UNPACK_FILENAME));

    if (!access(dst_path, F_OK))

      goto table_exists;

  }

sql/sql_update.cc

+3 −0
Original line number Diff line number Diff line
@@ -167,7 +167,10 @@ int mysql_update(THD *thd, 
  else if ((used_index=table->file->key_used_on_scan) < MAX_KEY)

    used_key_is_modified=check_if_key_used(table, used_index, fields);

  else

  {

    used_key_is_modified=0;

    used_index= MAX_KEY;

  }

  if (used_key_is_modified || order)

  {

    /*