Commit ca417a74 authored by unknown's avatar unknown
Browse files

WL#2645 (CHECK FOR UPGRADE) 

5.1-related fixes


BitKeeper/etc/ignore:
  Added scripts/mysql_upgrade to the ignore list
sql/ha_partition.cc:
  ha_check and ha_repair now to be called
sql/handler.cc:
  code modified to be 5.1 compliant
parent 53cf5e60

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1613,3 +1613,4 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

scripts/mysql_upgrade

sql/ha_partition.cc

+2 −2
Original line number Diff line number Diff line
@@ -1078,9 +1078,9 @@ static int handle_opt_part(THD *thd, HA_CHECK_OPT *check_opt, 
  else if (flag == ANALYZE_PARTS)

    error= file->analyze(thd, check_opt);

  else if (flag == CHECK_PARTS)

    error= file->check(thd, check_opt);

    error= file->ha_check(thd, check_opt);

  else if (flag == REPAIR_PARTS)

    error= file->repair(thd, check_opt);

    error= file->ha_repair(thd, check_opt);

  else

  {

    DBUG_ASSERT(FALSE);

sql/handler.cc

+3 −6
Original line number Diff line number Diff line
@@ -2081,10 +2081,7 @@ static bool update_frm_version(TABLE *table, bool needs_lock) 
  if (table->s->mysql_version != MYSQL_VERSION_ID)

    DBUG_RETURN(0);



  strxnmov(path, sizeof(path)-1, mysql_data_home, "/", table->s->db, "/",

           table->s->table_name, reg_ext, NullS);

  if (!unpack_filename(path, path))

    DBUG_RETURN(1);

  strxmov(path, table->s->normalized_path.str, reg_ext, NullS);



  if (needs_lock)

    pthread_mutex_lock(&LOCK_open);
@@ -2092,8 +2089,8 @@ static bool update_frm_version(TABLE *table, bool needs_lock) 
  if ((file= my_open(path, O_RDWR|O_BINARY, MYF(MY_WME))) >= 0)

  {

    uchar version[4];

    char *key= table->s->table_cache_key;

    uint key_length= table->s->key_length;

    char *key= table->s->table_cache_key.str;

    uint key_length= table->s->table_cache_key.length;

    TABLE *entry;

    HASH_SEARCH_STATE state;