← Back to branch summary

~ignacio-nin/percona-server/5.1-issue26684

« back to all changes in this revision

Viewing changes to innodb_pass_corrupt_table.patch

  • Committer: Oleg Tsarev
  • Date: 2010-12-14 20:03:02 UTC
  • mfrom: (169 release-5.1.53-tmp)
  • mto: This revision was merged to the branch mainline in revision 171.
  • Revision ID: oleg.tsarev@percona.com-20101214200302-hmulr329e352xhaw
add --without-response_time_distribution

Show diffs side-by-side

added added

removed removed

Lines of Context:
innodb_pass_corrupt_table.patch
932
932
        switch (ret) {
933
933
        case DB_SUCCESS:
934
934
                error = 0;
935
 
@@ -7204,6 +7267,10 @@
 
935
@@ -7212,6 +7275,10 @@
936
936
                DBUG_RETURN(my_errno=HA_ERR_WRONG_COMMAND);
937
937
        }
938
938
 
943
943
        /* Truncate the table in InnoDB */
944
944
 
945
945
        error = row_truncate_table_for_mysql(prebuilt->table, prebuilt->trx);
946
 
@@ -7212,6 +7279,10 @@
 
946
@@ -7220,6 +7287,10 @@
947
947
                goto fallback;
948
948
        }
949
949
 
954
954
        error = convert_error_code_to_mysql(error, prebuilt->table->flags,
955
955
                                            NULL);
956
956
 
957
 
@@ -7721,6 +7792,16 @@
 
957
@@ -7729,6 +7800,16 @@
958
958
        return(ranges + (double) rows / (double) total_rows * time_for_scan);
959
959
 }
960
960
 
971
971
 /*********************************************************************//**
972
972
 Calculates the key number used inside MySQL for an Innobase index. We will
973
973
 first check the "index translation table" for a match of the index to get
974
 
@@ -7842,7 +7923,7 @@
 
974
@@ -7850,7 +7931,7 @@
975
975
        ib_table = prebuilt->table;
976
976
 
977
977
        if (flag & HA_STATUS_TIME) {
980
980
                        /* In sql_show we call with this flag: update
981
981
                        then statistics so that they are up-to-date */
982
982
 
983
 
@@ -8133,10 +8214,18 @@
 
983
@@ -8141,10 +8222,18 @@
984
984
        THD*            thd,            /*!< in: connection thread handle */
985
985
        HA_CHECK_OPT*   check_opt)      /*!< in: currently ignored */
986
986
 {
999
999
        return(0);
1000
1000
 }
1001
1001
 
1002
 
@@ -8318,6 +8407,10 @@
 
1002
@@ -8326,6 +8415,10 @@
1003
1003
                my_error(ER_QUERY_INTERRUPTED, MYF(0));
1004
1004
        }
1005
1005
 
1010
1010
        DBUG_RETURN(is_ok ? HA_ADMIN_OK : HA_ADMIN_CORRUPT);
1011
1011
 }
1012
1012
 
1013
 
@@ -9043,6 +9136,10 @@
 
1013
@@ -9051,6 +9144,10 @@
1014
1014
 
1015
1015
        update_thd(thd);
1016
1016
 
1021
1021
        if (prebuilt->table->ibd_file_missing && !thd_tablespace_op(thd)) {
1022
1022
                ut_print_timestamp(stderr);
1023
1023
                fprintf(stderr,
1024
 
@@ -11485,6 +11582,14 @@
 
1024
@@ -11493,6 +11590,14 @@
1025
1025
   "0 (the default) disables automatic dumps.",
1026
1026
   NULL, NULL, 0, 0, UINT_MAX32, 0);
1027
1027
 
1036
1036
 static struct st_mysql_sys_var* innobase_system_variables[]= {
1037
1037
   MYSQL_SYSVAR(additional_mem_pool_size),
1038
1038
   MYSQL_SYSVAR(autoextend_increment),
1039
 
@@ -11570,6 +11675,7 @@
 
1039
@@ -11578,6 +11683,7 @@
1040
1040
   MYSQL_SYSVAR(io_capacity),
1041
1041
   MYSQL_SYSVAR(auto_lru_dump),
1042
1042
   MYSQL_SYSVAR(use_purge_thread),