Commit 8128e3e4 authored by unknown's avatar unknown
Browse files

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

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1


sql/ha_innodb.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/rt_split.c:
  Auto merged
storage/myisam/sp_key.c:
  Auto merged
storage/ndb/src/kernel/SimBlockList.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
parents a1e3d7ef 982bd00d

VC++Files/mysys/mysys.dsp

+5 −0
Original line number Diff line number Diff line
@@ -186,6 +186,11 @@ SOURCE=.\array.c 
!ENDIF



# End Source File

 

# Begin Source File

SOURCE=".\my_access.c"

# End Source File

 

# Begin Source File



SOURCE=".\charset-def.c"

VC++Files/mysys/mysys_ia64.dsp

+7 −0
Original line number Diff line number Diff line
@@ -163,6 +163,13 @@ LIB32=link.exe -lib 
# Name "mysys - WinIA64 Max"

# Name "mysys - WinIA64 TLS_DEBUG"

# Name "mysys - WinIA64 TLS"



# Begin Source File



SOURCE=.\my_access.c



# End Source File

 

# Begin Source File



SOURCE=.\array.c

include/my_global.h

+1 −1
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ C_MODE_END 
# endif

#endif /* TIME_WITH_SYS_TIME */

#ifdef HAVE_UNISTD_H

#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__)

#if defined(HAVE_OPENSSL) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) && !defined(__APPLE__)

#define crypt unistd_crypt

#endif

#include <unistd.h>

include/my_sys.h

+5 −0
Original line number Diff line number Diff line
@@ -600,6 +600,11 @@ extern char *_my_strdup_with_length(const byte *from, uint length, 
				    const char *sFile, uint uLine,

				    myf MyFlag);



#ifdef __WIN__

extern int my_access(const char *path, int amode);

#else

#define my_access access

#endif



#ifndef TERMINATE

extern void TERMINATE(FILE *file);

mysql-test/r/information_schema.result

+6 −6
Original line number Diff line number Diff line
@@ -412,11 +412,11 @@ NULL test key_1 test t1 UNIQUE 
NULL	test	key_2	test	t1	UNIQUE

select * from information_schema.KEY_COLUMN_USAGE where

TABLE_SCHEMA= "test";

CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT

NULL	test	PRIMARY	NULL	test	t1	a	1	NULL

NULL	test	constraint_1	NULL	test	t1	a	1	NULL

NULL	test	key_1	NULL	test	t1	a	1	NULL

NULL	test	key_2	NULL	test	t1	a	1	NULL

CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME

NULL	test	PRIMARY	NULL	test	t1	a	1	NULL	NULL	NULL	NULL

NULL	test	constraint_1	NULL	test	t1	a	1	NULL	NULL	NULL	NULL

NULL	test	key_1	NULL	test	t1	a	1	NULL	NULL	NULL	NULL

NULL	test	key_2	NULL	test	t1	a	1	NULL	NULL	NULL	NULL

select table_name from information_schema.TABLES where table_schema like "test%";

table_name

t1
@@ -560,7 +560,7 @@ TABLE_NAME= "vo"; 
CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_SCHEMA	TABLE_NAME	CONSTRAINT_TYPE

select * from information_schema.KEY_COLUMN_USAGE where

TABLE_NAME= "vo";

CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT

CONSTRAINT_CATALOG	CONSTRAINT_SCHEMA	CONSTRAINT_NAME	TABLE_CATALOG	TABLE_SCHEMA	TABLE_NAME	COLUMN_NAME	ORDINAL_POSITION	POSITION_IN_UNIQUE_CONSTRAINT	REFERENCED_TABLE_SCHEMA	REFERENCED_TABLE_NAME	REFERENCED_COLUMN_NAME

drop view vo;

select TABLE_NAME,TABLE_TYPE,ENGINE

from information_schema.tables