← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
444
444
innobase_commit_concurrency_validate(
445
445
/*=================================*/
446
446
        Session*                        ,       /*!< in: thread handle */
447
 
        struct st_mysql_sys_var*        ,       /*!< in: pointer to system
 
447
        drizzle_sys_var*        ,       /*!< in: pointer to system
448
448
                                                variable */
449
449
        void*                           save,   /*!< out: immediate result
450
450
                                                for update function */
451
 
        struct st_mysql_value*          value)  /*!< in: incoming string */
 
451
        drizzle_value*          value)  /*!< in: incoming string */
452
452
{
453
453
        int64_t         intbuf;
454
454
        ulong           commit_concurrency;
8462
8462
innodb_file_format_name_validate(
8463
8463
/*=============================*/
8464
8464
        Session*                        ,       /*!< in: thread handle */
8465
 
        struct st_mysql_sys_var*        ,       /*!< in: pointer to system
 
8465
        drizzle_sys_var*        ,       /*!< in: pointer to system
8466
8466
                                                variable */
8467
8467
        void*                           save,   /*!< out: immediate result
8468
8468
                                                for update function */
8469
 
        struct st_mysql_value*          value)  /*!< in: incoming string */
 
8469
        drizzle_value*          value)  /*!< in: incoming string */
8470
8470
{
8471
8471
        const char*     file_format_input;
8472
8472
        char            buff[STRING_BUFFER_USUAL_SIZE];
8502
8502
innodb_file_format_name_update(
8503
8503
/*===========================*/
8504
8504
        Session*                        ,               /*!< in: thread handle */
8505
 
        struct st_mysql_sys_var*        ,               /*!< in: pointer to
 
8505
        drizzle_sys_var*        ,               /*!< in: pointer to
8506
8506
                                                        system variable */
8507
8507
        void*                           var_ptr,        /*!< out: where the
8508
8508
                                                        formal string goes */
8539
8539
innodb_file_format_check_validate(
8540
8540
/*==============================*/
8541
8541
        Session*                        ,       /*!< in: thread handle */
8542
 
        struct st_mysql_sys_var*        ,       /*!< in: pointer to system
 
8542
        drizzle_sys_var*        ,       /*!< in: pointer to system
8543
8543
                                                variable */
8544
8544
        void*                           save,   /*!< out: immediate result
8545
8545
                                                for update function */
8546
 
        struct st_mysql_value*          value)  /*!< in: incoming string */
 
8546
        drizzle_value*          value)  /*!< in: incoming string */
8547
8547
{
8548
8548
        const char*     file_format_input;
8549
8549
        char            buff[STRING_BUFFER_USUAL_SIZE];
8593
8593
innodb_file_format_check_update(
8594
8594
/*============================*/
8595
8595
        Session*                        session,        /*!< in: thread handle */
8596
 
        struct st_mysql_sys_var*        ,               /*!< in: pointer to
 
8596
        drizzle_sys_var*        ,               /*!< in: pointer to
8597
8597
                                                        system variable */
8598
8598
        void*                           var_ptr,        /*!< out: where the
8599
8599
                                                        formal string goes */
8644
8644
innodb_adaptive_hash_index_update(
8645
8645
/*==============================*/
8646
8646
        Session*                        ,               /*!< in: thread handle */
8647
 
        struct st_mysql_sys_var*        ,               /*!< in: pointer to
 
8647
        drizzle_sys_var*        ,               /*!< in: pointer to
8648
8648
                                                        system variable */
8649
8649
        void*                           ,       /*!< out: where the
8650
8650
                                                        formal string goes */
8667
8667
innodb_change_buffering_validate(
8668
8668
/*=============================*/
8669
8669
        Session*                        ,       /*!< in: thread handle */
8670
 
        struct st_mysql_sys_var*        ,       /*!< in: pointer to system
 
8670
        drizzle_sys_var*        ,       /*!< in: pointer to system
8671
8671
                                                variable */
8672
8672
        void*                           save,   /*!< out: immediate result
8673
8673
                                                for update function */
8674
 
        struct st_mysql_value*          value)  /*!< in: incoming string */
 
8674
        drizzle_value*          value)  /*!< in: incoming string */
8675
8675
{
8676
8676
        const char*     change_buffering_input;
8677
8677
        char            buff[STRING_BUFFER_USUAL_SIZE];
8707
8707
innodb_change_buffering_update(
8708
8708
/*===========================*/
8709
8709
        Session*                        ,               /*!< in: thread handle */
8710
 
        struct st_mysql_sys_var*        ,               /*!< in: pointer to
 
8710
        drizzle_sys_var*        ,               /*!< in: pointer to
8711
8711
                                                        system variable */
8712
8712
        void*                           var_ptr,        /*!< out: where the
8713
8713
                                                        formal string goes */
8995
8995
  "trigger a readahead.",
8996
8996
  NULL, NULL, 56, 0, 64, 0);
8997
8997
 
8998
 
static struct st_mysql_sys_var* innobase_system_variables[]= {
 
8998
static drizzle_sys_var* innobase_system_variables[]= {
8999
8999
  DRIZZLE_SYSVAR(additional_mem_pool_size),
9000
9000
  DRIZZLE_SYSVAR(autoextend_increment),
9001
9001
  DRIZZLE_SYSVAR(buffer_pool_size),
9052
9052
  NULL
9053
9053
};
9054
9054
 
9055
 
drizzle_declare_plugin
 
9055
DRIZZLE_DECLARE_PLUGIN
9056
9056
{
9057
9057
  innobase_engine_name,
9058
9058
  INNODB_VERSION_STR,
9065
9065
  innobase_system_variables, /* system variables */
9066
9066
  NULL /* reserved */
9067
9067
}
9068
 
drizzle_declare_plugin_end;
 
9068
DRIZZLE_DECLARE_PLUGIN_END;
9069
9069
 
9070
9070
int ha_innobase::read_range_first(const key_range *start_key,
9071
9071
                                  const key_range *end_key,