← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/i_s.cc

  • Committer: Brian Aker
  • Date: 2009-11-03 23:06:41 UTC
  • mfrom: (1183.1.36 posulliv-is-work)
  • mto: This revision was merged to the branch mainline in revision 1207.
  • Revision ID: brian@gaz-20091103230641-521y27pqykjc3pne
Merge Padraig I_S

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/i_s.cc
734
734
TrxISMethods::fillTable(
735
735
/*======================*/
736
736
        Session*        session,/*!< in: thread */
737
 
        TableList*      tables, /*!< in/out: tables to fill */
738
 
        COND*           )       /*!< in: condition (not used) */
 
737
        TableList*      tables) /*!< in/out: tables to fill */
739
738
{
740
739
        const char*             table_name;
741
740
        int                     ret;
883
882
/*=============*/
884
883
        Session*        session,/*!< in: thread */
885
884
        TableList*      tables, /*!< in/out: tables to fill */
886
 
        COND*           ,       /*!< in: condition (ignored) */
887
885
        ibool           reset)  /*!< in: TRUE=reset cumulated counts */
888
886
{
889
887
        Table*  table   = (Table *) tables->table;
931
929
CmpISMethods::fillTable(
932
930
/*=========*/
933
931
        Session*        session,/*!< in: thread */
934
 
        TableList*      tables, /*!< in/out: tables to fill */
935
 
        COND*           cond)   /*!< in: condition (ignored) */
 
932
        TableList*      tables) /*!< in/out: tables to fill */
936
933
{
937
 
        return(i_s_cmp_fill_low(session, tables, cond, FALSE));
 
934
        return(i_s_cmp_fill_low(session, tables, FALSE));
938
935
}
939
936
 
940
937
/*******************************************************************//**
944
941
CmpResetISMethods::fillTable(
945
942
/*===============*/
946
943
        Session*        session,/*!< in: thread */
947
 
        TableList*      tables, /*!< in/out: tables to fill */
948
 
        COND*           cond)   /*!< in: condition (ignored) */
 
944
        TableList*      tables) /*!< in/out: tables to fill */
949
945
{
950
 
        return(i_s_cmp_fill_low(session, tables, cond, TRUE));
 
946
        return(i_s_cmp_fill_low(session, tables, TRUE));
951
947
}
952
948
 
953
949
/*******************************************************************//**
1042
1038
/*================*/
1043
1039
        Session*        session,/*!< in: thread */
1044
1040
        TableList*      tables, /*!< in/out: tables to fill */
1045
 
        COND*           ,       /*!< in: condition (ignored) */
1046
1041
        ibool           reset)  /*!< in: TRUE=reset cumulated counts */
1047
1042
{
1048
1043
        Table*  table   = (Table *) tables->table;
1087
1082
CmpmemISMethods::fillTable(
1088
1083
/*============*/
1089
1084
        Session*        session,/*!< in: thread */
1090
 
        TableList*      tables, /*!< in/out: tables to fill */
1091
 
        COND*           cond)   /*!< in: condition (ignored) */
 
1085
        TableList*      tables) /*!< in/out: tables to fill */
1092
1086
{
1093
 
        return(i_s_cmpmem_fill_low(session, tables, cond, FALSE));
 
1087
        return(i_s_cmpmem_fill_low(session, tables, FALSE));
1094
1088
}
1095
1089
 
1096
1090
/*******************************************************************//**
1100
1094
CmpmemResetISMethods::fillTable(
1101
1095
/*==================*/
1102
1096
        Session*        session,/*!< in: thread */
1103
 
        TableList*      tables, /*!< in/out: tables to fill */
1104
 
        COND*           cond)   /*!< in: condition (ignored) */
 
1097
        TableList*      tables) /*!< in/out: tables to fill */
1105
1098
{
1106
 
        return(i_s_cmpmem_fill_low(session, tables, cond, TRUE));
 
1099
        return(i_s_cmpmem_fill_low(session, tables, TRUE));
1107
1100
}
1108
1101
 
1109
1102
/*******************************************************************//**