database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

resolved conflict with pulled changeset

Browse Source
This commit is contained in:
kostja@oak.local
2003-07-09 18:24:43 +04:00
parent 39e7db9f51 0f28677af6
commit 941a8623ca
56 changed files with 1425 additions and 1593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/mysql.h
View File

@ -227,7 +227,9 @@ typedef struct st_mysql
enum mysql_status status;
my_bool free_me; /* If free in mysql_close */
my_bool reconnect; /* set to 1 if automatic reconnect */
char scramble_buff[21]; /* New protocol requires longer scramble*/
char scramble[SCRAMBLE_LENGTH+1]; /* for new servers */
char scramble_323[SCRAMBLE_LENGTH_323+1]; /* for old servers */
/*
Set if this is the original connection, not a master or a slave we have