diff --git a/.bzrignore b/.bzrignore
index 27f32040bc85b1d80a1693e1cb05ef9e36667268..521965cd6cde8c34d0698b0dca926d38e6c68f05 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -638,3 +638,4 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
+libmysqld/strfunc.cc
diff --git a/mysql-test/t/overflow.test b/mysql-test/t/overflow.test
index 6619a87cabb8ea7d9eee8f9b9701856f5915eb72..7a9616fd24e686bd3b2df23119b94d4e804d5f8b 100644
--- a/mysql-test/t/overflow.test
+++ b/mysql-test/t/overflow.test
@@ -1,4 +1,4 @@
 connect (con1,localhost,boo,,);
 connection con1;
--- error 1064,1102
+-- error 1064,1102,1279
 drop database AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA;
diff --git a/sql/unireg.h b/sql/unireg.h
index ef6a2f44ea78cd00540cbab95ca0d7d3b2634b91..66a274f3863841c588f4599fb133f9fe0dbfb1e9 100644
--- a/sql/unireg.h
+++ b/sql/unireg.h
@@ -63,6 +63,10 @@
 /* Max column width +1 */
 #define MAX_FIELD_WIDTH		(MAX_FIELD_CHARLENGTH*MAX_MBWIDTH+1)
 
+#define MAX_DATE_WIDTH		10	/* YYYY-MM-DD */
+#define MAX_TIME_WIDTH		23	/* -DDDDDD HH:MM:SS.###### */
+#define MAX_DATETIME_FULL_WIDTH 29	/* YYYY-MM-DD HH:MM:SS.###### AM */
+#define MAX_DATETIME_WIDTH	19	/* YYYY-MM-DD HH:MM:SS */
 
 #define MAX_TABLES	(sizeof(table_map)*8-2)	/* Max tables in join */
 #define OUTER_REF_TABLE_BIT	(((table_map) 1) << (sizeof(table_map)*8-2))