Merge MySQL->MariaDB

* Finished Monty and Jani's merge
* Some InnoDB tests still fail (because it's old xtradb code run against
  newer testsuite). They are expected to go after mergning with the latest
  xtradb.
This commit is contained in:
Sergey Petrunya 2009-09-08 00:50:10 +04:00
commit 29f0dcb563
1190 changed files with 268606 additions and 17715 deletions

View file

@ -28,10 +28,10 @@
#include "mysql_priv.h"
SQL_CRYPT::SQL_CRYPT(const char *password)
SQL_CRYPT::SQL_CRYPT(const char *password, uint length)
{
ulong rand_nr[2];
hash_password(rand_nr,password, (uint) strlen(password));
hash_password(rand_nr,password, length);
crypt_init(rand_nr);
}