~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

  • Committer: Brian Aker
  • Date: 2008-08-05 04:10:42 UTC
  • mfrom: (261.2.8 codestyle)
  • mto: This revision was merged to the branch mainline in revision 263.
  • Revision ID: brian@tangent.org-20080805041042-1l4893r3bwy2lxz2
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
1152
1152
          {
1153
1153
            LEX *lex = Lex;
1154
1154
            lex->sql_command = SQLCOM_CHANGE_MASTER;
1155
 
            memset((char*) &lex->mi, 0, sizeof(lex->mi));
 
1155
            memset(&lex->mi, 0, sizeof(lex->mi));
1156
1156
          }
1157
1157
          master_defs
1158
1158
          {}
1200
1200
            }
1201
1201
            if (Lex->mi.heartbeat_period > slave_net_timeout)
1202
1202
            {
1203
 
              push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
 
1203
              push_warning_printf(YYTHD, DRIZZLE_ERROR::WARN_LEVEL_WARN,
1204
1204
                                  ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE,
1205
1205
                                  ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE),
1206
1206
                                  " exceeds the value of `slave_net_timeout' sec.",
1211
1211
            {
1212
1212
              if (Lex->mi.heartbeat_period != 0.0)
1213
1213
              {
1214
 
                push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
 
1214
                push_warning_printf(YYTHD, DRIZZLE_ERROR::WARN_LEVEL_WARN,
1215
1215
                                    ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE,
1216
1216
                                    ER(ER_SLAVE_HEARTBEAT_VALUE_OUT_OF_RANGE),
1217
1217
                                    " is less than 1 msec.",
1275
1275
            lex->alter_info.reset();
1276
1276
            lex->col_list.empty();
1277
1277
            lex->change=NullS;
1278
 
            memset((char*) &lex->create_info, 0, sizeof(lex->create_info));
 
1278
            memset(&lex->create_info, 0, sizeof(lex->create_info));
1279
1279
            lex->create_info.options=$2 | $4;
1280
1280
            lex->create_info.db_type= ha_default_handlerton(thd);
1281
1281
            lex->create_info.default_table_charset= NULL;
1289
1289
            if (!lex->create_info.db_type)
1290
1290
            {
1291
1291
              lex->create_info.db_type= ha_default_handlerton(YYTHD);
1292
 
              push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN,
 
1292
              push_warning_printf(YYTHD, DRIZZLE_ERROR::WARN_LEVEL_WARN,
1293
1293
                                  ER_WARN_USING_OTHER_HANDLER,
1294
1294
                                  ER(ER_WARN_USING_OTHER_HANDLER),
1295
1295
                                  ha_resolve_storage_engine_name(lex->create_info.db_type),
2397
2397
            lex->select_lex.init_order();
2398
2398
            lex->select_lex.db=
2399
2399
              ((TABLE_LIST*) lex->select_lex.table_list.first)->db;
2400
 
            memset((char*) &lex->create_info, 0, sizeof(lex->create_info));
 
2400
            memset(&lex->create_info, 0, sizeof(lex->create_info));
2401
2401
            lex->create_info.db_type= 0;
2402
2402
            lex->create_info.default_table_charset= NULL;
2403
2403
            lex->create_info.row_type= ROW_TYPE_NOT_USED;
2651
2651
            lex->sql_command = SQLCOM_SLAVE_START;
2652
2652
            lex->type = 0;
2653
2653
            /* We'll use mi structure for UNTIL options */
2654
 
            memset((char*) &lex->mi, 0, sizeof(lex->mi));
 
2654
            memset(&lex->mi, 0, sizeof(lex->mi));
2655
2655
            /* If you change this code don't forget to update SLAVE START too */
2656
2656
          }
2657
2657
          slave_until
2669
2669
            lex->sql_command = SQLCOM_SLAVE_START;
2670
2670
            lex->type = 0;
2671
2671
            /* We'll use mi structure for UNTIL options */
2672
 
            memset((char*) &lex->mi, 0, sizeof(lex->mi));
 
2672
            memset(&lex->mi, 0, sizeof(lex->mi));
2673
2673
          }
2674
2674
          slave_until
2675
2675
          {}
5332
5332
            lex->lock_option= TL_READ;
5333
5333
            mysql_init_select(lex);
5334
5334
            lex->current_select->parsing_place= SELECT_LIST;
5335
 
            memset((char*) &lex->create_info, 0, sizeof(lex->create_info));
 
5335
            memset(&lex->create_info, 0, sizeof(lex->create_info));
5336
5336
          }
5337
5337
          show_param
5338
5338
          {}