diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-06-01 16:00:38 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-06-01 16:00:38 +0400 |
| commit | bdcce95f1347c9e24257a21096cc6f4e6c085c9e (patch) | |
| tree | 56315491cf4cef28a3140a8445cc412749dac6d6 /sql/sql_yacc.yy | |
| parent | 9cc4cb0ea1f429983ce7ee8783504fa7fb5c2d7f (diff) | |
| parent | 2df531fdc44a1bf410a79624932533ecb44f84ce (diff) | |
| download | mariadb-git-bdcce95f1347c9e24257a21096cc6f4e6c085c9e.tar.gz | |
Manual merge.
Diffstat (limited to 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 0b158ff7574..c40062e5d52 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -12118,15 +12118,16 @@ text_or_password: | PASSWORD '(' TEXT_STRING ')' { $$= $3.length ? YYTHD->variables.old_passwords ? - Item_func_old_password::alloc(YYTHD, $3.str) : - Item_func_password::alloc(YYTHD, $3.str) : + Item_func_old_password::alloc(YYTHD, $3.str, $3.length) : + Item_func_password::alloc(YYTHD, $3.str, $3.length) : $3.str; if ($$ == NULL) MYSQL_YYABORT; } | OLD_PASSWORD '(' TEXT_STRING ')' { - $$= $3.length ? Item_func_old_password::alloc(YYTHD, $3.str) : + $$= $3.length ? Item_func_old_password::alloc(YYTHD, $3.str, + $3.length) : $3.str; if ($$ == NULL) MYSQL_YYABORT; @@ -12588,7 +12589,7 @@ grant_user: (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1); if (buff == NULL) MYSQL_YYABORT; - make_scrambled_password_323(buff, $4.str); + my_make_scrambled_password_323(buff, $4.str, $4.length); $1->password.str= buff; $1->password.length= SCRAMBLED_PASSWORD_CHAR_LENGTH_323; } @@ -12598,7 +12599,7 @@ grant_user: (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1); if (buff == NULL) MYSQL_YYABORT; - make_scrambled_password(buff, $4.str); + my_make_scrambled_password(buff, $4.str, $4.length); $1->password.str= buff; $1->password.length= SCRAMBLED_PASSWORD_CHAR_LENGTH; } |