1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

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

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


sql/sql_lex.h:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
This commit is contained in:
unknown
2005-06-16 12:02:17 +02:00
9 changed files with 72 additions and 21 deletions

View File

@ -114,6 +114,14 @@ enum enum_sp_data_access
SP_MODIFIES_SQL_DATA
};
const LEX_STRING sp_data_access_name[]=
{
{ (char*) STRING_WITH_LEN("") },
{ (char*) STRING_WITH_LEN("CONTAINS SQL") },
{ (char*) STRING_WITH_LEN("NO SQL") },
{ (char*) STRING_WITH_LEN("READS SQL DATA") },
{ (char*) STRING_WITH_LEN("MODIFIES SQL DATA") }
};
#define DERIVED_SUBQUERY 1
#define DERIVED_VIEW 2