Merge mysql.com:/home/jonas/src/wl1882

into mysql.com:/home/jonas/src/mysql-5.0-ndb


include/my_sys.h:
  Auto merged
mysys/default.c:
  Auto merged
This commit is contained in:
unknown 2005-06-13 11:59:51 +02:00
commit fd34694dc8
2 changed files with 60 additions and 1 deletions

View file

@ -263,6 +263,7 @@ extern my_bool NEAR my_disable_locking,NEAR my_disable_async_io,
extern char wild_many,wild_one,wild_prefix;
extern const char *charsets_dir;
extern char *defaults_extra_file;
extern const char *defaults_instance;
extern my_bool timed_mutexes;