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

Manual merge of 5.1 into 5.1-runtime

mysql-test/r/subselect.result:
  Manual merge
server-tools/instance-manager/mysqlmanager.cc:
  Manual merge
sql/event_scheduler.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
This commit is contained in:
unknown
2007-03-01 13:47:28 -07:00
parent ee950898e3
commit 38a8283c6d
4 changed files with 51 additions and 1026 deletions

View File

@ -84,7 +84,7 @@ int main(int argc, char *argv[])
MY_INIT(argv[0]);
log_init();
umask(0117);
srand((unsigned int) time(0));
srand((uint) time(0));
/* Main function. */