diff options
| author | monty@tik.mysql.fi <> | 2002-03-02 13:59:26 +0200 |
|---|---|---|
| committer | monty@tik.mysql.fi <> | 2002-03-02 13:59:26 +0200 |
| commit | cb3499b7de17980f0b759fb29cb87f69cf85b725 (patch) | |
| tree | 7aaf6176c31c5fbb5f32f4e3d41711cf61470003 /sql/sql_acl.cc | |
| parent | 863b5da02d8220ae03684c510af3436647755c87 (diff) | |
| parent | 9d9bcf25e7d6dccd531bea72f68f3317324ea051 (diff) | |
| download | mariadb-git-cb3499b7de17980f0b759fb29cb87f69cf85b725.tar.gz | |
merge
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index c5782f65798..869be5b327d 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -221,6 +221,8 @@ int acl_init(bool dont_read_acl_tables) user.x509_issuer=get_field(&mem, table, 19); user.x509_subject=get_field(&mem, table, 20); } + else + user.ssl_type=SSL_TYPE_NONE; #endif /* HAVE_OPENSSL */ if (user.password && (length=(uint) strlen(user.password)) == 8 && protocol_version == PROTOCOL_VERSION) @@ -1201,7 +1203,7 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo, /* We write down SSL related ACL stuff */ DBUG_PRINT("info",("table->fields=%d",table->fields)); if (table->fields >= 21) /* From 4.0.0 we have more fields */ - { + { table->field[18]->store("",0); table->field[19]->store("",0); table->field[20]->store("",0); |