diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-03-01 13:47:28 -0700 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-03-01 13:47:28 -0700 |
| commit | 38a8283c6d6bf3b36547c8474e9411b800e3ba5f (patch) | |
| tree | 1f027489c49cb17023eba6e7192a08cf51b1ff3c /server-tools | |
| parent | ee950898e3aa6b188f8f8d8e490b75bab1213ec3 (diff) | |
| download | mariadb-git-38a8283c6d6bf3b36547c8474e9411b800e3ba5f.tar.gz | |
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
Diffstat (limited to 'server-tools')
| -rw-r--r-- | server-tools/instance-manager/mysqlmanager.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-tools/instance-manager/mysqlmanager.cc b/server-tools/instance-manager/mysqlmanager.cc index 75769af631a..6d6ebbee57d 100644 --- a/server-tools/instance-manager/mysqlmanager.cc +++ b/server-tools/instance-manager/mysqlmanager.cc @@ -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. */ |