mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
merge with 3.23.51
BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BitKeeper/deleted/.del-mysql_fix_extensions.sh: Delete: scripts/mysql_fix_extensions.sh Build-tools/Do-rpm: Auto merged Makefile.am: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged extra/resolve_stack_dump.c: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/mysqld_error.h: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged isam/pack_isam.c: Auto merged libmysql/libmysql.c: Auto merged mysql-test/r/func_if.result: Auto merged mysql-test/t/join.test: Auto merged mysys/array.c: Auto merged mysys/charset.c: Auto merged mysys/default.c: Auto merged mysys/hash.c: Auto merged mysys/my_thr_init.c: Auto merged mysys/raid.cc: Auto merged mysql-test/t/type_decimal.test: Auto merged sql/hostname.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_timefunc.h: Auto merged sql/log.cc: Auto merged sql/mini_client.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged strings/Makefile.am: Auto merged
This commit is contained in:
@ -1,17 +1,20 @@
|
||||
/* Copyright (C) 1979-1999 TcX AB & Monty Program KB & Detron HB
|
||||
/* Copyright (C) 1979-2002 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 */
|
||||
|
||||
This software is distributed with NO WARRANTY OF ANY KIND. No author or
|
||||
distributor accepts any responsibility for the consequences of using it, or
|
||||
for whether it serves any particular purpose or works at all, unless he or
|
||||
she says so in writing. Refer to the Free Public License (the "License")
|
||||
for full details.
|
||||
Every copy of this file must include a copy of the License, normally in a
|
||||
plain ASCII text file named PUBLIC. The License grants you the right to
|
||||
copy, modify and redistribute this file, but only under certain conditions
|
||||
described in the License. Among other things, the License requires that
|
||||
the copyright notice and this notice be preserved on all copies. */
|
||||
|
||||
/* Pack isam file*/
|
||||
/* Pack isam file */
|
||||
|
||||
#ifndef USE_MY_FUNC
|
||||
#define USE_MY_FUNC /* We nead at least my_malloc */
|
||||
|
Reference in New Issue
Block a user