mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 07:35:32 +02:00
Increased max possible max_allowed_packet to 1G
Small optimization to not do external locking of temporary MyISAM tables. BitKeeper/deleted/.del-sslopt-usage.h~3ab77eeeaad1ba0a: Delete: include/sslopt-usage.h Docs/manual.texi: Fixed wrong descrtion of IF() Added information about automatic cast of integer to binary string ChangeLog client/mysqlbinlog.cc: Portability fix client/mysqldump.c: Increased max possible max_allowed_packet to 1G include/Makefile.am: Removed sslopt-usage.h Made sslopt-case.h global include/my_sys.h: Fixd protypes for my_strdup_with_length() mysys/safemalloc.c: Fixd some prototypes sql/ha_isam.cc: Don't do external locking on temporary tables sql/ha_myisam.cc: Don't do external locking on temporary tables sql/lock.cc: Added big description of how LOCK TABLES affects locking sql/log_event.cc: cleanup sql/mysqld.cc: Increased max possible max_allowed_packet to 1G sql/sql_table.cc: Fixed portability problem
This commit is contained in:
parent
83fc12f216
commit
a355b6ac70
13 changed files with 85 additions and 56 deletions
|
|
@ -20,8 +20,8 @@ pkginclude_HEADERS = dbug.h m_string.h my_sys.h my_list.h \
|
|||
mysql.h mysql_com.h mysqld_error.h mysql_embed.h \
|
||||
my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
|
||||
errmsg.h my_global.h my_net.h my_alloc.h \
|
||||
my_getopt.h sslopt-longopts.h sslopt-usage.h \
|
||||
sslopt-vars.h $(BUILT_SOURCES)
|
||||
my_getopt.h sslopt-longopts.h \
|
||||
sslopt-vars.h sslopt-case.h $(BUILT_SOURCES)
|
||||
noinst_HEADERS = config-win.h config-os2.h \
|
||||
nisam.h heap.h merge.h my_bitmap.h\
|
||||
myisam.h myisampack.h myisammrg.h ft_global.h\
|
||||
|
|
|
|||
|
|
@ -553,9 +553,9 @@ extern gptr _my_memdup(const byte *from,uint length,
|
|||
const char *sFile, uint uLine,myf MyFlag);
|
||||
extern my_string _my_strdup(const char *from, const char *sFile, uint uLine,
|
||||
myf MyFlag);
|
||||
extern my_string _my_strdup_with_length(const char *from, uint length,
|
||||
const char *sFile, uint uLine,
|
||||
myf MyFlag);
|
||||
extern char *_my_strdup_with_length(const byte *from, uint length,
|
||||
const char *sFile, uint uLine,
|
||||
myf MyFlag);
|
||||
|
||||
#ifndef TERMINATE
|
||||
extern void TERMINATE(FILE *file);
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
/* Copyright (C) 2000 MySQL AB
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
||||
|
||||
#ifdef HAVE_OPENSSL
|
||||
puts("\
|
||||
--ssl Use SSL for connection (automatically set with other flags\n\
|
||||
--ssl-key X509 key in PEM format (implies --ssl)\n\
|
||||
--ssl-cert X509 cert in PEM format (implies --ssl)\n\
|
||||
--ssl-ca CA file in PEM format (check OpenSSL docs, implies --ssl)\n\
|
||||
--ssl-capath CA directory (check OpenSSL docs, implies --ssl)\n\
|
||||
--ssl-cipher SSL cipher to use (implies --ssl)");
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue