Merge remote-tracking branch 'origin/master' into bindgen-update

This commit is contained in:
John Gallagher 2015-12-13 08:45:59 -05:00
commit bf96a15bcf

View File

@ -658,13 +658,12 @@ impl InnerConnection {
fn execute_batch(&mut self, sql: &str) -> Result<()> {
let c_sql = try!(str_to_cstring(sql));
unsafe {
let mut errmsg: *mut c_char = mem::uninitialized();
let r = ffi::sqlite3_exec(self.db(),
c_sql.as_ptr(),
None,
ptr::null_mut(),
&mut errmsg);
self.decode_result_with_errmsg(r, errmsg)
ptr::null_mut());
self.decode_result(r)
}
}