← Back to branch summary

~tsarev/percona-server/5.1.59-porting-bad

« back to all changes in this revision

Viewing changes to innodb_pass_corrupt_table.patch

  • Committer: kinoyasu
  • Date: 2011-07-07 13:02:19 UTC
  • mto: This revision was merged to the branch mainline in revision 256.
  • Revision ID: kinoyasu@gauntlet4-20110707130219-bev0gkkvwkh47u4m
Yasufumi patches are ported to 5.1.58. Removing/changing the patch files against my intention is not allowed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_pass_corrupt_table.patch
922
922
        switch (ret) {
923
923
        case DB_SUCCESS:
924
924
                error = 0;
925
 
@@ -7233,6 +7296,10 @@
 
925
@@ -7227,6 +7290,10 @@
926
926
                DBUG_RETURN(my_errno=HA_ERR_WRONG_COMMAND);
927
927
        }
928
928
 
933
933
        /* Truncate the table in InnoDB */
934
934
 
935
935
        error = row_truncate_table_for_mysql(prebuilt->table, prebuilt->trx);
936
 
@@ -7241,6 +7308,10 @@
 
936
@@ -7235,6 +7302,10 @@
937
937
                goto fallback;
938
938
        }
939
939
 
944
944
        error = convert_error_code_to_mysql(error, prebuilt->table->flags,
945
945
                                            NULL);
946
946
 
947
 
@@ -7753,6 +7824,16 @@
 
947
@@ -7739,6 +7810,16 @@
948
948
        return(ranges + (double) rows / (double) total_rows * time_for_scan);
949
949
 }
950
950
 
961
961
 /*********************************************************************//**
962
962
 Calculates the key number used inside MySQL for an Innobase index. We will
963
963
 first check the "index translation table" for a match of the index to get
964
 
@@ -7933,7 +8014,7 @@
 
964
@@ -7919,7 +8000,7 @@
965
965
        ib_table = prebuilt->table;
966
966
 
967
967
        if (flag & HA_STATUS_TIME) {
970
970
                        /* In sql_show we call with this flag: update
971
971
                        then statistics so that they are up-to-date */
972
972
 
973
 
@@ -8223,10 +8304,18 @@
 
973
@@ -8209,10 +8290,18 @@
974
974
        THD*            thd,            /*!< in: connection thread handle */
975
975
        HA_CHECK_OPT*   check_opt)      /*!< in: currently ignored */
976
976
 {
989
989
        return(0);
990
990
 }
991
991
 
992
 
@@ -8408,6 +8497,10 @@
 
992
@@ -8394,6 +8483,10 @@
993
993
                my_error(ER_QUERY_INTERRUPTED, MYF(0));
994
994
        }
995
995
 
1000
1000
        DBUG_RETURN(is_ok ? HA_ADMIN_OK : HA_ADMIN_CORRUPT);
1001
1001
 }
1002
1002
 
1003
 
@@ -9133,6 +9226,10 @@
 
1003
@@ -9127,6 +9220,10 @@
1004
1004
 
1005
1005
        update_thd(thd);
1006
1006
 
1011
1011
        if (prebuilt->table->ibd_file_missing && !thd_tablespace_op(thd)) {
1012
1012
                ut_print_timestamp(stderr);
1013
1013
                fprintf(stderr,
1014
 
@@ -11565,6 +11662,14 @@
 
1014
@@ -11561,6 +11658,14 @@
1015
1015
   "0 (the default) disables automatic dumps.",
1016
1016
   NULL, NULL, 0, 0, UINT_MAX32, 0);
1017
1017
 
1026
1026
 static struct st_mysql_sys_var* innobase_system_variables[]= {
1027
1027
   MYSQL_SYSVAR(additional_mem_pool_size),
1028
1028
   MYSQL_SYSVAR(autoextend_increment),
1029
 
@@ -11650,6 +11755,7 @@
 
1029
@@ -11646,6 +11751,7 @@
1030
1030
   MYSQL_SYSVAR(io_capacity),
1031
1031
   MYSQL_SYSVAR(auto_lru_dump),
1032
1032
   MYSQL_SYSVAR(use_purge_thread),