1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Change client_flag to unsigned long (16 -> 32 bits) to handle more options.

Don't use new password format if mysql.user has old format
tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
Portability fixes for Windows


client/mysql.cc:
  Removed compiler warnings.
  Make quote handling simpler
include/config-win.h:
  Fix for myisam/rt_mbr.c
include/mysql.h:
  Change client_flag to unsigned long to handle more options.
libmysql/libmysql.c:
  Change client_flag to unsigned long to handle more options.
libmysqld/libmysqld.c:
  Change client_flag to unsigned long to handle more options.
myisam/rt_mbr.c:
  Portability fix for Windows
mysql-test/r/rpl_loaddata.result:
  Fix test case
sql/item_strfunc.cc:
  Don't use new password format if mysql.user has old format
sql/item_strfunc.h:
  Don't use new password format if mysql.user has old format
sql/mysql_priv.h:
  Don't use new password format if mysql.user has old format
sql/mysqld.cc:
  Don't use new password format if mysql.user has old format
sql/sql_acl.cc:
  Don't use new password format if mysql.user has old format.
  tables_priv was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_class.h:
  Don't use new password format if mysql.user has old format
sql/sql_parse.cc:
  Change client_flag to unsigned long to handle more options.
sql/sql_yacc.yy:
  Don't use new password format if mysql.user has old format
strings/ctype-utf8.c:
  Remove compiler warnings
strings/ctype-win1250ch.c:
  Remove compiler warnings
tests/grant.res:
  Update results
This commit is contained in:
unknown
2003-01-18 16:39:21 +02:00
parent 76c8b9bece
commit 61434bf8e8
18 changed files with 245 additions and 210 deletions

View File

@@ -117,7 +117,8 @@ typedef struct st_mysql_data {
} MYSQL_DATA;
struct st_mysql_options {
unsigned int connect_timeout,client_flag;
unsigned int connect_timeout;
unsigned long client_flag;
unsigned int port;
char *host,*user,*password,*unix_socket,*db;
struct st_dynamic_array *init_commands;
@@ -191,7 +192,8 @@ typedef struct st_mysql
my_ulonglong extra_info; /* Used by mysqlshow */
unsigned long thread_id; /* Id for connection in server */
unsigned long packet_length;
unsigned int port,client_flag,server_capabilities;
unsigned int port;
unsigned long client_flag,server_capabilities;
unsigned int protocol_version;
unsigned int field_count;
unsigned int server_status;
@@ -314,7 +316,7 @@ MYSQL * STDCALL mysql_real_connect(MYSQL *mysql, const char *host,
const char *db,
unsigned int port,
const char *unix_socket,
unsigned int clientflag);
unsigned long clientflag);
void STDCALL mysql_close(MYSQL *sock);
int STDCALL mysql_select_db(MYSQL *mysql, const char *db);
int STDCALL mysql_query(MYSQL *mysql, const char *q);