← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: brian
  • Date: 2008-08-01 17:27:37 UTC
  • mfrom: (261.1.6 drizzle)
  • Revision ID: brian@localhost.localdomain-20080801172737-v6f9pau23un0bwfl
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
1805
1805
      this could be improved by having a common stack of handlers.
1806
1806
    */
1807
1807
    if (thd->handle_error(error, str,
1808
 
                          MYSQL_ERROR::WARN_LEVEL_ERROR))
 
1808
                          DRIZZLE_ERROR::WARN_LEVEL_ERROR))
1809
1809
      return;;
1810
1810
 
1811
1811
    thd->is_slave_error=  1; // needed to catch query errors during replication
1834
1834
        inside push_warning.
1835
1835
      */
1836
1836
      thd->no_warnings_for_error= true;
1837
 
      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, error, str);
 
1837
      push_warning(thd, DRIZZLE_ERROR::WARN_LEVEL_ERROR, error, str);
1838
1838
      thd->no_warnings_for_error= false;
1839
1839
    }
1840
1840
  }
4190
4190
  max_used_connections= slow_launch_threads = 0;
4191
4191
  mysqld_user= mysqld_chroot= opt_init_file= opt_bin_logname = 0;
4192
4192
  opt_mysql_tmpdir= my_bind_addr_str= NullS;
4193
 
  memset((uchar*) &mysql_tmpdir_list, 0, sizeof(mysql_tmpdir_list));
4194
 
  memset((char *) &global_status_var, 0, sizeof(global_status_var));
 
4193
  memset(&mysql_tmpdir_list, 0, sizeof(mysql_tmpdir_list));
 
4194
  memset(&global_status_var, 0, sizeof(global_status_var));
4195
4195
  key_map_full.set_all();
4196
4196
 
4197
4197
  /* Character sets */
4966
4966
  add_to_status(&global_status_var, &thd->status_var);
4967
4967
 
4968
4968
  /* Reset thread's status variables */
4969
 
  memset((uchar*) &thd->status_var, 0, sizeof(thd->status_var));
 
4969
  memset(&thd->status_var, 0, sizeof(thd->status_var));
4970
4970
 
4971
4971
  /* Reset some global variables */
4972
4972
  reset_status_vars();