summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/r/type_float.result2
-rw-r--r--sql/log_event.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/type_float.result b/mysql-test/r/type_float.result
index 3dee0c2fcf9..f044ced2342 100644
--- a/mysql-test/r/type_float.result
+++ b/mysql-test/r/type_float.result
@@ -83,7 +83,7 @@ show create table t2;
Table Create Table
t2 CREATE TABLE `t2` (
`col` double default NULL
-) TYPE=MyISAM
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1,t2;
create table t1 (a float);
insert into t1 values (1);
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 9cbcead743f..abbccb32034 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1675,7 +1675,7 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli,
thd->db= (char*) rewrite_db(db);
DBUG_ASSERT(thd->query == 0);
thd->query= 0; // Should not be needed
- thd->querty_length= 0; // Should not be needed
+ thd->query_length= 0; // Should not be needed
thd->query_error= 0;
clear_all_errors(thd, rli);
if (!use_rli_only_for_errors)