1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Added support of INSERT to MERGE tables

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

View File

@ -2014,6 +2014,7 @@ mysql_close(MYSQL *mysql)
mysql_close(tmp);
tmp = tmp1;
}
mysql->rpl_pivot=0;
}
if (mysql != mysql->master)
mysql_close(mysql->master);