Commit e3648650 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0
parents 74693a28 6a77c469

VC++Files/sql/mysqld.dsp

+7 −3
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ LINK32=xilink6.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c

# ADD CPP /nologo /G6 /MTd /W3 /Z7 /Od /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "_DEBUG" /D "SAFEMALLOC" /D "SAFE_MUTEX" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /FD /c

# SUBTRACT CPP /Fr /YX

# ADD BASE RSC /l 0x410 /d "_DEBUG"

# ADD RSC /l 0x409 /d "_DEBUG"
@@ -130,7 +130,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-nt-max /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -159,7 +159,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /D "NDEBUG" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../bdb/build_win32" /I "../include" /I "../regex" /I "../extra/yassl/include" /I "../zlib" /D "NDEBUG" /D "DBUG_OFF" /D "USE_SYMDIR" /D "HAVE_INNOBASE_DB" /D "HAVE_BERKELEY_DB" /D "HAVE_ARCHIVE_DB" /D "HAVE_BLACKHOLE_DB" /D "HAVE_FEDERATED_DB" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-max /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"
@@ -452,6 +452,10 @@ SOURCE=.\gstream.cpp 
# End Source File

# Begin Source File



SOURCE=.\examples\ha_archive.cpp

# End Source File

# Begin Source File



SOURCE=.\ha_blackhole.cpp

# End Source File

# Begin Source File

mysql-test/lib/init_db.sql

+6 −2
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ CREATE TABLE host ( 
  Lock_tables_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Create_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Show_view_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Create_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Alter_routine_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  Execute_priv enum('N','Y') COLLATE utf8_general_ci DEFAULT 'N' NOT NULL,

  PRIMARY KEY Host (Host,Db)

) engine=MyISAM

CHARACTER SET utf8 COLLATE utf8_bin
@@ -489,10 +492,11 @@ CREATE TABLE procs_priv ( 
  Db char(64) binary DEFAULT '' NOT NULL,

  User char(16) binary DEFAULT '' NOT NULL,

  Routine_name char(64) binary DEFAULT '' NOT NULL,

  Routine_type enum('FUNCTION','PROCEDURE') NOT NULL,

  Grantor char(77) DEFAULT '' NOT NULL,

  Timestamp timestamp(14),

  Proc_priv set('Execute','Alter Routine','Grant') COLLATE utf8_general_ci DEFAULT '' NOT NULL,

  PRIMARY KEY (Host,Db,User,Routine_name),

  Timestamp timestamp(14),

  PRIMARY KEY (Host,Db,User,Routine_name,Routine_type),

  KEY Grantor (Grantor)

) engine=MyISAM

CHARACTER SET utf8 COLLATE utf8_bin

mysql-test/r/bugs.result

0 → 100644
+138 −0
Original line number Diff line number Diff line 
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;

mysql-test/t/bugs.test

0 → 100644
+85 −0
Original line number Diff line number Diff line 
#

# 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;

sql/examples/ha_archive.cc

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#pragma implementation        // gcc: Class implementation

#endif



#include <mysql_priv.h>

#include "../mysql_priv.h"



#ifdef HAVE_ARCHIVE_DB

#include "ha_archive.h"