diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index ba0a80331b1..3417c7ecb85 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -2057,6 +2057,10 @@ t2	1	fld3	1	fld3	A	NULL	NULL	NULL		BTREE
 drop table t4, t3, t2, t1;
 DO 1;
 DO benchmark(100,1+1),1,1;
+do default;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
+do foobar;
+ERROR 42S22: Unknown column 'foobar' in 'field list'
 CREATE TABLE t1 (
 id mediumint(8) unsigned NOT NULL auto_increment,
 pseudo varchar(35) NOT NULL default '',
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index 5bae44796dc..3b36ba6bfb2 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -1756,6 +1756,15 @@ drop table t4, t3, t2, t1;
 DO 1;
 DO benchmark(100,1+1),1,1;
 
+#
+# Bug #6449: do default;
+#
+
+--error 1064
+do default;
+--error 1054
+do foobar;
+
 #
 # random in WHERE clause
 #
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index d9545d5cbb8..cdbf2eb3d6a 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -144,7 +144,7 @@ static int ndb_to_mysql_error(const NdbError *err)
       // Push the NDB error message as warning
       push_warning_printf(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
 			  ER_GET_ERRMSG, ER(ER_GET_ERRMSG),
-			  err->code, err->message, "NDB");      
+			  err->code, err->message, "NDB");
       return err->code;
     }
   }
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 521196085bb..8cbfaf3f99b 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -3932,11 +3932,12 @@ do:	DO_SYM
 	{
 	  LEX *lex=Lex;
 	  lex->sql_command = SQLCOM_DO;
-	  if (!(lex->insert_list = new List_item))
-	    YYABORT;
+	  mysql_init_select(lex);
+	}
+	expr_list
+	{
+	  Lex->insert_list= $3;
 	}
-	values
-	{}
 	;
 
 /*
diff --git a/strings/ctype-tis620.c b/strings/ctype-tis620.c
index 68bfefafe6a..5d37aa965d9 100644
--- a/strings/ctype-tis620.c
+++ b/strings/ctype-tis620.c
@@ -541,7 +541,7 @@ int my_strnncoll_tis620(CHARSET_INFO *cs __attribute__((unused)),
 
   tc1= buf;
   if ((len1 + len2 +2) > (int) sizeof(buf))
-    tc1= (uchar*) malloc(len1+len2);
+    tc1= (uchar*) malloc(len1+len2+2);
   tc2= tc1 + len1+1;
   memcpy((char*) tc1, (char*) s1, len1);
   tc1[len1]= 0;		/* if length(s1)> len1, need to put 'end of string' */
@@ -568,7 +568,7 @@ int my_strnncollsp_tis620(CHARSET_INFO * cs __attribute__((unused)),
   
   a= buf;
   if ((a_length + b_length +2) > (int) sizeof(buf))
-    alloced= a= (uchar*) malloc(a_length+b_length);
+    alloced= a= (uchar*) malloc(a_length+b_length+2);
   
   b= a + a_length+1;
   memcpy((char*) a, (char*) a0, a_length);