mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
SCRUM
including client code into embedded server code to guess what library to use added net_field_length moved to pack.c include/mysql.h: typedefinitions moved for suitability mysql_option.methods_to_use added include/mysql_com.h: net_store_length declaration libmysql/libmysql.c: net_store_length moved to sql-common/pack.c libmysqld/libmysqld.c: added code to guess whether to use remote or embedded connection sql-common/client.c: options checking added sql-common/pack.c: net_store_length implementation moved here sql/protocol.cc: net_store_length moved to sql-common/pack.c
This commit is contained in:
@@ -1303,6 +1303,7 @@ mysql_init(MYSQL *mysql)
|
||||
#ifdef HAVE_SMEM
|
||||
mysql->options.shared_memory_base_name= (char*) def_shared_memory_base_name;
|
||||
#endif
|
||||
mysql->options.methods_to_use= MYSQL_OPT_GUESS_CONNECTION;
|
||||
return mysql;
|
||||
}
|
||||
|
||||
@@ -2512,6 +2513,10 @@ mysql_options(MYSQL *mysql,enum mysql_option option, const char *arg)
|
||||
my_free(mysql->options.shared_memory_base_name,MYF(MY_ALLOW_ZERO_PTR));
|
||||
mysql->options.shared_memory_base_name=my_strdup(arg,MYF(MY_WME));
|
||||
#endif
|
||||
case MYSQL_OPT_USE_REMOTE_CONNECTION:
|
||||
case MYSQL_OPT_USE_EMBEDDED_CONNECTION:
|
||||
case MYSQL_OPT_GUESS_CONNECTION:
|
||||
mysql->options.methods_to_use= option;
|
||||
break;
|
||||
default:
|
||||
DBUG_RETURN(1);
|
||||
|
Reference in New Issue
Block a user