Commit f97fd0f0 authored by unknown's avatar unknown
Browse files

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

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


myisam/mi_create.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 9dd851ba 555ea37d

myisam/mi_create.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
    if (share.base.raid_type)

    {

      (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_chunks,

				share.base.raid_chunksize,

sql/mysqld.cc

+2 −2
Original line number Diff line number Diff line
@@ -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,

   GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"allow-suspicious-udfs", OPT_ALLOW_SUSPICIOUS_UDFS,

   "Allows to use UDF's consisting of only one symbol xxx() "

   "without corresponing xxx_init() or xxx_deinit(). That also means "

   "Allows use of UDFs consisting of only one symbol xxx() "

   "without corresponding xxx_init() or xxx_deinit(). That also means "

   "that one can load any function from any library, for example exit() "

   "from libc.so",

   (gptr*) &opt_allow_suspicious_udfs, (gptr*) &opt_allow_suspicious_udfs,