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

Added support of INSERT to MERGE tables

Browse Source 
Fixes for embedded libary and openssl


BUILD/compile-pentium-debug-max:
  Added --with-openssl
acinclude.m4:
  Cleanup
client/client_priv.h:
  Include mysql_embed.h to remove not used functions in embedded server
client/mysql.cc:
  Don't use openssl with embedded server
include/Makefile.am:
  Move mysql_embed.h to 'include' directory
include/myisammrg.h:
  Added support of INSERT to MERGE tables
include/mysql.h:
  Fixes for embedded libary and openssl
include/mysql_com.h:
  Fixes for embedded libary and openssl
include/mysql_embed.h:
  Fixes for embedded libary and openssl
include/violite.h:
  Cleanup
libmysql/libmysql.c:
  Safety
libmysqld/examples/Makefile.am:
  Fixes for embedded libary and openssl
libmysqld/lib_sql.cc:
  Fixes for embedded libary and openssl
libmysqld/lib_vio.c:
  Fixes for embedded libary and openssl
libmysqld/libmysqld.c:
  Fixes for embedded libary and openssl
myisammrg/Makefile.am:
  Added support of INSERT to MERGE tables
myisammrg/myrg_create.c:
  Added support of INSERT to MERGE tables
myisammrg/myrg_open.c:
  Added support of INSERT to MERGE tables
myisammrg/myrg_static.c:
  Added support of INSERT to MERGE tables
mysql-test/t/union.test:
  Portability fix
sql/Makefile.am:
  Fixes for embedded libary and openssl
sql/gen_lex_hash.cc:
  Added support of INSERT to MERGE tables
sql/ha_myisammrg.cc:
  Added support of INSERT to MERGE tables
sql/handler.h:
  Added support of INSERT to MERGE tables
sql/mini_client.cc:
  Fixes for embedded libary and openssl
sql/net_serv.cc:
  Fixes for embedded libary and openssl
sql/sql_show.cc:
  Cleanup
Build-tools/Do-all-build-steps:
  Don't build openssl (Need to add proper configure test when to build ssl)
sql/lex.h:
  Added support of INSERT to MERGE tables
sql/sql_yacc.yy:
  Fixes for embedded libary and openssl
This commit is contained in:
unknown
2001-09-22 17:40:57 +03:00
parent 2504336b41
commit e7b9eabeca
31 changed files with 235 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
client/mysql.cc
View File

@@ -303,6 +303,7 @@ int main(int argc,char *argv[])
exit(1);
glob_buffer.realloc(512);
completion_hash_init(&ht,50);
bzero((char*) &mysql, sizeof(mysql));
if (sql_connect(current_host,current_db,current_user,opt_password,
opt_silent))
{
@@ -326,11 +327,13 @@ int main(int argc,char *argv[])
put_info((char*) glob_buffer.ptr(),INFO_INFO);
#ifdef HAVE_OPENSSL
if(mysql.net.vio->ssl_ && SSL_get_cipher(mysql.net.vio->ssl_)) {
if (mysql.net.vio->ssl_ && SSL_get_cipher(mysql.net.vio->ssl_))
{
sprintf((char*) glob_buffer.ptr(),
"SSL cipher in use is %s\n", SSL_get_cipher(mysql.net.vio->ssl_));
"SSL cipher in use is %s\n", SSL_get_cipher(mysql.net.vio->ssl_));
put_info((char*) glob_buffer.ptr(),INFO_INFO);
} else
}
else
put_info("SSL is not in use\n",INFO_INFO);
#endif /* HAVE_OPENSSL */
@@ -373,13 +376,7 @@ int main(int argc,char *argv[])
sig_handler mysql_end(int sig)
{
if (connected)
mysql_close(&mysql);
#ifdef HAVE_OPENSSL
else
mysql_ssl_clear(&mysql); /* SSL data structres should be freed
even if connection was not made */
#endif
mysql_close(&mysql);
#ifdef HAVE_READLINE
if (!status.batch && !quick && !opt_html && !opt_xml)
{
@@ -2208,16 +2205,8 @@ static int
sql_real_connect(char *host,char *database,char *user,char *password,
uint silent)
{
if (connected)
{ /* if old is open, close it first */
mysql_close(&mysql);
connected= 0;
}
#ifdef HAVE_OPENSSL
else
mysql_ssl_clear(&mysql); /* SSL data structres should be freed
even if connection was not made */
#endif
mysql_close(&mysql);
connected= 0;
mysql_init(&mysql);
if (opt_connect_timeout)
{
@@ -2569,7 +2558,7 @@ static void mysql_end_timer(ulong start_time,char *buff)
strmov(strend(buff),")");
}
#ifndef EMBEDDED_SERVER
#ifndef EMBEDDED_LIBRARY
/* Keep sql_string library happy */
gptr sql_alloc(unsigned int Size)
@@ -2581,4 +2570,4 @@ void sql_element_free(void *ptr)
{
my_free((gptr) ptr,MYF(0));
}
#endif /* EMBEDDED_SERVER */
#endif /* EMBEDDED_LIBRARY */