Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-build

into mysql.com:/Users/kent/mysql/bk/mysql-5.0


myisammrg/myrg_open.c:
  Auto merged
mysys/my_getwd.c:
  Auto merged
sql/unireg.cc:
  Auto merged

2 files changed, 223 insertions, 0 deletions

diff --git a/mysql-test/r/bugs.result b/mysql-test/r/bugs.result
new file mode 100644
index 00000000000..7db20c2b096
--- /dev/null
+++ b/mysql-test/r/bugs.result
@@ -0,0 +1,138 @@
+drop table if exists t1,t2,t3,t4,t5,t6;
+drop database if exists mysqltest;
+CREATE TABLE t1 (a varchar(30) binary NOT NULL DEFAULT ' ',
+b varchar(1) binary NOT NULL DEFAULT ' ',
+c varchar(4) binary NOT NULL DEFAULT '0000',
+d tinyblob NULL,
+e tinyblob NULL,
+f tinyblob NULL,
+g tinyblob NULL,
+h tinyblob NULL,
+i tinyblob NULL,
+j tinyblob NULL,
+k tinyblob NULL,
+l tinyblob NULL,
+m tinyblob NULL,
+n tinyblob NULL,
+o tinyblob NULL,
+p tinyblob NULL,
+q varchar(30) binary NOT NULL DEFAULT ' ',
+r varchar(30) binary NOT NULL DEFAULT ' ',
+s tinyblob NULL,
+t varchar(4) binary NOT NULL DEFAULT ' ',
+u varchar(1) binary NOT NULL DEFAULT ' ',
+v varchar(30) binary NOT NULL DEFAULT ' ',
+w varchar(30) binary NOT NULL DEFAULT ' ',
+x tinyblob NULL,
+y varchar(5) binary NOT NULL DEFAULT ' ',
+z varchar(20) binary NOT NULL DEFAULT ' ',
+a1 varchar(30) binary NOT NULL DEFAULT ' ',
+b1 tinyblob NULL)
+ENGINE=InnoDB DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `b` varchar(1) collate latin1_bin NOT NULL default ' ',
+  `c` varchar(4) collate latin1_bin NOT NULL default '0000',
+  `d` tinyblob,
+  `e` tinyblob,
+  `f` tinyblob,
+  `g` tinyblob,
+  `h` tinyblob,
+  `i` tinyblob,
+  `j` tinyblob,
+  `k` tinyblob,
+  `l` tinyblob,
+  `m` tinyblob,
+  `n` tinyblob,
+  `o` tinyblob,
+  `p` tinyblob,
+  `q` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `r` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `s` tinyblob,
+  `t` varchar(4) collate latin1_bin NOT NULL default ' ',
+  `u` varchar(1) collate latin1_bin NOT NULL default ' ',
+  `v` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `w` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `x` tinyblob,
+  `y` varchar(5) collate latin1_bin NOT NULL default ' ',
+  `z` varchar(20) collate latin1_bin NOT NULL default ' ',
+  `a1` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `b1` tinyblob
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_bin
+INSERT into t1 (b) values ('1');
+SHOW WARNINGS;
+Level	Code	Message
+SELECT * from t1;
+a	b	c	d	e	f	g	h	i	j	k	l	m	n	o	p	q	r	s	t	u	v	w	x	y	z	a1	b1
+ 	1	0000	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	 	 	NULL	 	 	 	 	NULL	 	 	 	NULL
+CREATE TABLE t2 (a varchar(30) binary NOT NULL DEFAULT ' ',
+b varchar(1) binary NOT NULL DEFAULT ' ',
+c varchar(4) binary NOT NULL DEFAULT '0000',
+d tinyblob NULL,
+e tinyblob NULL,
+f tinyblob NULL,
+g tinyblob NULL,
+h tinyblob NULL,
+i tinyblob NULL,
+j tinyblob NULL,
+k tinyblob NULL,
+l tinyblob NULL,
+m tinyblob NULL,
+n tinyblob NULL,
+o tinyblob NULL,
+p tinyblob NULL,
+q varchar(30) binary NOT NULL DEFAULT ' ',
+r varchar(30) binary NOT NULL DEFAULT ' ',
+s tinyblob NULL,
+t varchar(4) binary NOT NULL DEFAULT ' ',
+u varchar(1) binary NOT NULL DEFAULT ' ',
+v varchar(30) binary NOT NULL DEFAULT ' ',
+w varchar(30) binary NOT NULL DEFAULT ' ',
+x tinyblob NULL,
+y varchar(5) binary NOT NULL DEFAULT ' ',
+z varchar(20) binary NOT NULL DEFAULT ' ',
+a1 varchar(30) binary NOT NULL DEFAULT ' ',
+b1 tinyblob NULL)
+ENGINE=MyISAM DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin;
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `b` varchar(1) collate latin1_bin NOT NULL default ' ',
+  `c` varchar(4) collate latin1_bin NOT NULL default '0000',
+  `d` tinyblob,
+  `e` tinyblob,
+  `f` tinyblob,
+  `g` tinyblob,
+  `h` tinyblob,
+  `i` tinyblob,
+  `j` tinyblob,
+  `k` tinyblob,
+  `l` tinyblob,
+  `m` tinyblob,
+  `n` tinyblob,
+  `o` tinyblob,
+  `p` tinyblob,
+  `q` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `r` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `s` tinyblob,
+  `t` varchar(4) collate latin1_bin NOT NULL default ' ',
+  `u` varchar(1) collate latin1_bin NOT NULL default ' ',
+  `v` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `w` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `x` tinyblob,
+  `y` varchar(5) collate latin1_bin NOT NULL default ' ',
+  `z` varchar(20) collate latin1_bin NOT NULL default ' ',
+  `a1` varchar(30) collate latin1_bin NOT NULL default ' ',
+  `b1` tinyblob
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_bin
+INSERT into t2 (b) values ('1');
+SHOW WARNINGS;
+Level	Code	Message
+SELECT * from t2;
+a	b	c	d	e	f	g	h	i	j	k	l	m	n	o	p	q	r	s	t	u	v	w	x	y	z	a1	b1
+ 	1	0000	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	 	 	NULL	 	 	 	 	NULL	 	 	 	NULL
+drop table t1;
+drop table t2;
diff --git a/mysql-test/t/bugs.test b/mysql-test/t/bugs.test
new file mode 100644
index 00000000000..3b842c06561
--- /dev/null
+++ b/mysql-test/t/bugs.test
@@ -0,0 +1,85 @@
+#
+# test of already fixed bugs
+#
+--disable_warnings
+drop table if exists t1,t2,t3,t4,t5,t6;
+drop database if exists mysqltest;
+--enable_warnings
+
+#
+# Bug 10838
+# Insert causes warnings for no default values and corrupts tables
+#
+CREATE TABLE t1 (a varchar(30) binary NOT NULL DEFAULT ' ',
+                 b varchar(1) binary NOT NULL DEFAULT ' ',
+		 c varchar(4) binary NOT NULL DEFAULT '0000',
+		 d tinyblob NULL,
+		 e tinyblob NULL,
+		 f tinyblob NULL,
+		 g tinyblob NULL,
+		 h tinyblob NULL,
+		 i tinyblob NULL,
+		 j tinyblob NULL,
+		 k tinyblob NULL,
+		 l tinyblob NULL,
+		 m tinyblob NULL,
+		 n tinyblob NULL,
+		 o tinyblob NULL,
+		 p tinyblob NULL,
+                 q varchar(30) binary NOT NULL DEFAULT ' ',
+                 r varchar(30) binary NOT NULL DEFAULT ' ',
+		 s tinyblob NULL,
+                 t varchar(4) binary NOT NULL DEFAULT ' ',
+                 u varchar(1) binary NOT NULL DEFAULT ' ',
+                 v varchar(30) binary NOT NULL DEFAULT ' ',
+                 w varchar(30) binary NOT NULL DEFAULT ' ',
+		 x tinyblob NULL,
+                 y varchar(5) binary NOT NULL DEFAULT ' ',
+                 z varchar(20) binary NOT NULL DEFAULT ' ',
+                 a1 varchar(30) binary NOT NULL DEFAULT ' ',
+		 b1 tinyblob NULL)
+ENGINE=InnoDB DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin;
+
+SHOW CREATE TABLE t1;
+INSERT into t1 (b) values ('1');
+SHOW WARNINGS;
+SELECT * from t1;
+
+CREATE TABLE t2 (a varchar(30) binary NOT NULL DEFAULT ' ',
+                 b varchar(1) binary NOT NULL DEFAULT ' ',
+		 c varchar(4) binary NOT NULL DEFAULT '0000',
+		 d tinyblob NULL,
+		 e tinyblob NULL,
+		 f tinyblob NULL,
+		 g tinyblob NULL,
+		 h tinyblob NULL,
+		 i tinyblob NULL,
+		 j tinyblob NULL,
+		 k tinyblob NULL,
+		 l tinyblob NULL,
+		 m tinyblob NULL,
+		 n tinyblob NULL,
+		 o tinyblob NULL,
+		 p tinyblob NULL,
+                 q varchar(30) binary NOT NULL DEFAULT ' ',
+                 r varchar(30) binary NOT NULL DEFAULT ' ',
+		 s tinyblob NULL,
+                 t varchar(4) binary NOT NULL DEFAULT ' ',
+                 u varchar(1) binary NOT NULL DEFAULT ' ',
+                 v varchar(30) binary NOT NULL DEFAULT ' ',
+                 w varchar(30) binary NOT NULL DEFAULT ' ',
+		 x tinyblob NULL,
+                 y varchar(5) binary NOT NULL DEFAULT ' ',
+                 z varchar(20) binary NOT NULL DEFAULT ' ',
+                 a1 varchar(30) binary NOT NULL DEFAULT ' ',
+		 b1 tinyblob NULL)
+ENGINE=MyISAM DEFAULT CHARACTER SET = latin1 COLLATE latin1_bin;
+
+SHOW CREATE TABLE t2;
+INSERT into t2 (b) values ('1');
+SHOW WARNINGS;
+SELECT * from t2;
+
+drop table t1;
+drop table t2;
+