1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/mydev/mysql-4.0

Browse Source 
into mysql.com:/home/mydev/mysql-4.1-4100


myisam/mi_create.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown 2005-03-04 09:35:21 +01:00
commit f97fd0f0b7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
myisam/mi_create.c
View File

@ -562,7 +562,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs,
if (share.base.raid_type) if (share.base.raid_type)
{ {
(void) fn_format(filename,name,"",MI_NAME_DEXT,2+4); (void) fn_format(filename,name,"",MI_NAME_DEXT,2+4);
if ((dfile=my_raid_create(filename, 0, create_mode if ((dfile=my_raid_create(filename, 0, create_mode,
share.base.raid_type, share.base.raid_type,
share.base.raid_chunks, share.base.raid_chunks,
share.base.raid_chunksize, share.base.raid_chunksize,

4
sql/mysqld.cc
View File

@ -4176,8 +4176,8 @@ struct my_option my_long_options[] =
{"ansi", 'a', "Use ANSI SQL syntax instead of MySQL syntax. This mode will also set transaction isolation level 'serializable'.", 0, 0, 0, {"ansi", 'a', "Use ANSI SQL syntax instead of MySQL syntax. This mode will also set transaction isolation level 'serializable'.", 0, 0, 0,
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
{"allow-suspicious-udfs", OPT_ALLOW_SUSPICIOUS_UDFS, {"allow-suspicious-udfs", OPT_ALLOW_SUSPICIOUS_UDFS,
"Allows to use UDF's consisting of only one symbol xxx() " "Allows use of UDFs consisting of only one symbol xxx() "
"without corresponing xxx_init() or xxx_deinit(). That also means " "without corresponding xxx_init() or xxx_deinit(). That also means "
"that one can load any function from any library, for example exit() " "that one can load any function from any library, for example exit() "
"from libc.so", "from libc.so",
(gptr*) &opt_allow_suspicious_udfs, (gptr*) &opt_allow_suspicious_udfs, (gptr*) &opt_allow_suspicious_udfs, (gptr*) &opt_allow_suspicious_udfs,