← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2010-05-15 01:19:45 UTC
  • Revision ID: brian@gaz-20100515011945-uxhf94vi0tzm0vq6
Rename of KEY to KeyInfo

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/handler0alter.cc
228
228
int
229
229
innobase_check_index_keys(
230
230
/*======================*/
231
 
        const KEY*      key_info,       /*!< in: Indexes to be created */
 
231
        const KeyInfo*  key_info,       /*!< in: Indexes to be created */
232
232
        ulint           num_of_keys)    /*!< in: Number of indexes to
233
233
                                        be created */
234
234
{
238
238
        ut_ad(num_of_keys);
239
239
 
240
240
        for (key_num = 0; key_num < num_of_keys; key_num++) {
241
 
                const KEY&      key = key_info[key_num];
 
241
                const KeyInfo&  key = key_info[key_num];
242
242
 
243
243
                /* Check that the same index name does not appear
244
244
                twice in indexes to be created. */
245
245
 
246
246
                for (ulint i = 0; i < key_num; i++) {
247
 
                        const KEY&      key2 = key_info[i];
 
247
                        const KeyInfo&  key2 = key_info[i];
248
248
 
249
249
                        if (0 == strcmp(key.name, key2.name)) {
250
250
                                errmsg_printf(ERRMSG_LVL_ERROR, "InnoDB: key name `%s` appears"
367
367
void
368
368
innobase_create_index_def(
369
369
/*======================*/
370
 
        KEY*                    key,            /*!< in: key definition */
 
370
        KeyInfo*                        key,            /*!< in: key definition */
371
371
        bool                    new_primary,    /*!< in: TRUE=generating
372
372
                                                a new primary key
373
373
                                                on the table */
492
492
        const dict_table_t*table,               /*!< in: table definition */
493
493
        mem_heap_t*     heap,           /*!< in: heap where space for key
494
494
                                        definitions are allocated */
495
 
        KEY*            key_info,       /*!< in: Indexes to be created */
 
495
        KeyInfo*                key_info,       /*!< in: Indexes to be created */
496
496
        ulint&          n_keys)         /*!< in/out: Number of indexes to
497
497
                                        be created */
498
498
{
604
604
ha_innobase::add_index(
605
605
/*===================*/
606
606
        Table*  i_table,        /*!< in: Table where indexes are created */
607
 
        KEY*    key_info,       /*!< in: Indexes to be created */
 
607
        KeyInfo*        key_info,       /*!< in: Indexes to be created */
608
608
        uint    num_of_keys)    /*!< in: Number of indexes to be created */
609
609
{
610
610
        dict_index_t**  index;          /*!< Index to be created */
943
943
        }
944
944
 
945
945
        for (n_key = 0; n_key < num_of_keys; n_key++) {
946
 
                const KEY*      key;
 
946
                const KeyInfo*  key;
947
947
                dict_index_t*   index;
948
948
 
949
949
                key = i_table->key_info + key_num[n_key];