← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_yacc.yy

Merged from Felipe

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_yacc.yy
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.",
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),