mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
b388eb004d
bmove_allign -> bmove_align Added OLAP function ROLLUP Split mysql_fix_privilege_tables to a script and a .sql data file Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects. Added table_alias_charset, for easier --lower-case-table-name handling Better SQL_MODE handling (Setting complex options also sets sub options) New (faster) assembler string functions for x86 BitKeeper/etc/ignore: added libmysqld/sql_state.c client/mysql.cc: Added SQLSTATE to error messages Added new function put_error() to be able to clean up some old code. client/mysqltest.c: Write ERROR SQLSTATE for all errors dbug/dbug.c: Portability fixes include/m_string.h: Rename bmove_allign as bmove_align include/mysql.h: Added SQLSTATE (for embedded version) include/mysql_com.h: Send correct SQLSTATE for the error to the client libmysql/libmysql.c: Changed default error state to HY000 Applied code cleanup patch libmysqld/Makefile.am: Added sql_state.cc libmysqld/libmysqld.c: Added sqlstate mysql-test/r/analyse.result: Updated results mysql-test/r/ansi.result: Updated results mysql-test/r/auto_increment.result: Updated results mysql-test/r/bdb-deadlock.result: Updated results mysql-test/r/bdb.result: Updated results mysql-test/r/comments.result: Updated results mysql-test/r/create.result: Updated results mysql-test/r/ctype_collate.result: Updated results mysql-test/r/delayed.result: Updated results mysql-test/r/delete.result: Updated results mysql-test/r/derived.result: Updated results mysql-test/r/distinct.result: Updated results mysql-test/r/drop.result: Updated results mysql-test/r/err000001.result: Updated results mysql-test/r/explain.result: Updated results mysql-test/r/flush.result: Updated results mysql-test/r/fulltext.result: Updated results mysql-test/r/func_gconcat.result: Updated results mysql-test/r/func_system.result: Updated results mysql-test/r/grant_cache.result: Updated results mysql-test/r/group_by.result: Updated results mysql-test/r/handler.result: Updated results mysql-test/r/heap.result: Updated results mysql-test/r/heap_btree.result: Updated results mysql-test/r/heap_hash.result: Updated results mysql-test/r/innodb.result: Updated results mysql-test/r/innodb_handler.result: Updated results mysql-test/r/insert_select.result: Updated results mysql-test/r/insert_update.result: Updated results mysql-test/r/join.result: Updated results mysql-test/r/join_outer.result: Updated results mysql-test/r/key.result: Updated results mysql-test/r/lock.result: Updated results mysql-test/r/lock_multi.result: Updated results mysql-test/r/merge.result: Updated results mysql-test/r/multi_update.result: Updated results mysql-test/r/myisam.result: Updated results mysql-test/r/null.result: Updated results mysql-test/r/olap.result: Updated results mysql-test/r/order_by.result: Updated results mysql-test/r/packet.result: Updated results mysql-test/r/query_cache.result: Updated results mysql-test/r/row.result: Updated results mysql-test/r/rpl000001.result: Updated results mysql-test/r/rpl000009.result: Updated results mysql-test/r/rpl_empty_master_crash.result: Updated results mysql-test/r/rpl_log.result: Updated results mysql-test/r/rpl_replicate_do.result: Updated results mysql-test/r/rpl_rotate_logs.result: Updated results mysql-test/r/select.result: Updated results mysql-test/r/select_safe.result: Updated results mysql-test/r/show_check.result: Updated results mysql-test/r/sql_mode.result: Updated results mysql-test/r/subselect.result: Updated results mysql-test/r/temp_table.result: Updated results mysql-test/r/truncate.result: Updated results mysql-test/r/type_blob.result: Updated results mysql-test/r/type_decimal.result: Updated results mysql-test/r/type_float.result: Updated results mysql-test/r/type_ranges.result: Updated results mysql-test/r/union.result: Updated results mysql-test/r/update.result: Updated results mysql-test/r/user_var.result: Updated results mysql-test/r/varbinary.result: Updated results mysql-test/r/variables.result: Updated results mysql-test/t/ansi.test: Test of sql_mode mysql-test/t/derived.test: Updated results mysql-test/t/func_system.test: Make this independen of the MySQL server name mysql-test/t/lowercase_table.test: Cleanup mysql-test/t/olap.test: A lot of new tests mysql-test/t/sql_mode.test: More test for sql_mode mysql-test/t/subselect.test: Added a few new tests (to find a bug in the item_ref code) scripts/Makefile.am: Added mysql_fix_privilege_tables.sql scripts/mysql_fix_privilege_tables.sh: Totally new script. This bascily just pipes mysql_fix_privilege_tables.sql through 'mysql' to 'mysqld' sql/Makefile.am: Added sql_state.cc sql/item.cc: Extended Item_field::eq() to be able to better match GROUP BY fields on the command line. Needed for ROLLUP sql/item.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/item_sum.cc: Moved copy_or_same() and some reset() functions from item_sum.h Needed to be able to access thd->mem_root. sql/item_sum.h: Moved some functions to item_sum.cc Added make_unique() for ROLLUP sql/item_uniq.h: Fixed return value sql/mysql_priv.h: Updated MODE flags sql/mysqld.cc: Added ANSI as it's own mode Moved charset_info variables here Cleaned up handler_count handling (for NT) Added table_alias_charset, for easier --lower-case-table-name handling sql/net_serv.cc: New comment sql/protocol.cc: Send SQLSTATE to client sql/set_var.cc: Better SQL_MODE handling (Setting complex options also sets sub options) sql/set_var.h: Better SQL_MODE handling sql/sql_base.cc: Make alias depend on --lower-case-table-names Make find_item_in_list also check database name sql/sql_cache.cc: Indentation cleanup sql/sql_list.h: Added safety assert Addes support of alloc without current_thd() sql/sql_prepare.cc: Update after prototype change sql/sql_select.cc: Added ROLLUP sql/sql_select.h: structures for rollup sql/sql_show.cc: Easier SQL_MODE handling sql/sql_string.cc: Move CHARSET_INFO to mysqld (to be together with all other global variables) sql/sql_string.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/sql_table.cc: Simpler --lower-case-table-name handling sql/sql_union.cc: Update after prototype change sql/sql_yacc.yy: ROLLUP sql/unireg.h: bmove_allign ->bmove_align strings/Makefile.am: Fix to be able to compile str_test.c strings/ctype.c: Removed empty lines strings/str_test.c: Added test of bmove_align strings/strings-x86.s: Faster bmove_align, bmove_upp and strmake strings/strings.asm: move_allg
148 lines
4.6 KiB
Makefile
148 lines
4.6 KiB
Makefile
# Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult 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
|
|
|
|
## Process this file with automake to create Makefile.in
|
|
|
|
bin_SCRIPTS = @server_scripts@ \
|
|
msql2mysql \
|
|
mysql_config \
|
|
mysql_fix_privilege_tables \
|
|
mysql_fix_extensions \
|
|
mysql_setpermission \
|
|
mysql_secure_installation \
|
|
mysql_zap \
|
|
mysqlaccess \
|
|
mysqlbug \
|
|
mysql_convert_table_format \
|
|
mysql_find_rows \
|
|
mysqlhotcopy \
|
|
mysqldumpslow \
|
|
mysql_explain_log \
|
|
mysql_tableinfo \
|
|
mysqld_multi
|
|
|
|
EXTRA_SCRIPTS = make_binary_distribution.sh \
|
|
make_win_src_distribution.sh \
|
|
msql2mysql.sh \
|
|
mysql_config.sh \
|
|
mysql_fix_privilege_tables.sh \
|
|
mysql_fix_extensions.sh \
|
|
mysql_install_db.sh \
|
|
mysql_setpermission.sh \
|
|
mysql_secure_installation.sh \
|
|
mysql_zap.sh \
|
|
mysqlaccess.sh \
|
|
mysqlbug.sh \
|
|
mysql_convert_table_format.sh \
|
|
mysql_find_rows.sh \
|
|
mysqlhotcopy.sh \
|
|
mysqldumpslow.sh \
|
|
mysql_explain_log.sh \
|
|
mysqld_multi.sh \
|
|
mysql_tableinfo.sh \
|
|
mysqld_safe.sh \
|
|
fill_help_tables.sh
|
|
|
|
EXTRA_DIST = $(EXTRA_SCRIPTS) \
|
|
mysqlaccess.conf \
|
|
mysqlbug
|
|
|
|
pkgdata_DATA = fill_help_tables.sql mysql_fix_privilege_tables.sql
|
|
|
|
# mysqlbug should be distributed built so that people can report build
|
|
# failures with it.
|
|
CLEANFILES = @server_scripts@ \
|
|
make_binary_distribution \
|
|
make_win_src_distribution \
|
|
msql2mysql \
|
|
mysql_config \
|
|
mysql_fix_privilege_tables \
|
|
mysql_fix_extensions \
|
|
mysql_setpermission \
|
|
mysql_secure_installation \
|
|
mysql_zap \
|
|
mysqlaccess \
|
|
mysql_convert_table_format \
|
|
mysql_find_rows \
|
|
mysqlhotcopy \
|
|
mysqldumpslow \
|
|
mysqld_multi \
|
|
fill_help_tables \
|
|
fill_help_tables.sql
|
|
|
|
SUPERCLEANFILES = mysqlbug
|
|
|
|
# We want the right version and configure comand line in mysqlbug
|
|
mysqlbug: ${top_builddir}/config.status mysqlbug.sh
|
|
|
|
SUFFIXES = .sh
|
|
|
|
.sh:
|
|
@RM@ -f $@ $@-t
|
|
@SED@ \
|
|
-e 's!@''bindir''@!$(bindir)!g' \
|
|
-e 's!@''sbindir''@!$(sbindir)!g' \
|
|
-e 's!@''scriptdir''@!$(bindir)!g' \
|
|
-e 's!@''prefix''@!$(prefix)!g' \
|
|
-e 's!@''datadir''@!$(datadir)!g' \
|
|
-e 's!@''localstatedir''@!$(localstatedir)!g' \
|
|
-e 's!@''libexecdir''@!$(libexecdir)!g' \
|
|
-e 's!@''pkglibdir''@!$(pkglibdir)!g' \
|
|
-e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
|
|
-e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
|
|
-e 's!@''CC''@!@CC@!'\
|
|
-e 's!@''CXX''@!@CXX@!'\
|
|
-e 's!@''GXX''@!@GXX@!'\
|
|
-e 's!@''CC_VERSION''@!@CC_VERSION@!'\
|
|
-e 's!@''CXX_VERSION''@!@CXX_VERSION@!'\
|
|
-e 's!@''PERL''@!@PERL@!' \
|
|
-e 's!@''ASFLAGS''@!@SAVE_ASFLAGS@!'\
|
|
-e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\
|
|
-e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
|
|
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
|
|
-e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
|
|
-e 's!@''LIBS''@!@LIBS@!' \
|
|
-e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
|
|
-e 's!@''VERSION''@!@VERSION@!' \
|
|
-e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
|
|
-e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
|
|
-e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
|
|
-e 's!@''HOSTNAME''@!@HOSTNAME@!' \
|
|
-e 's!@''SYSTEM_TYPE''@!@SYSTEM_TYPE@!' \
|
|
-e 's!@''CHECK_PID''@!@CHECK_PID@!' \
|
|
-e 's!@''FIND_PROC''@!@FIND_PROC@!' \
|
|
-e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
|
|
-e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
|
|
-e 's!@''MYSQL_TCP_PORT''@!@MYSQL_TCP_PORT@!' \
|
|
-e 's!@''IS_LINUX''@!@IS_LINUX@!' \
|
|
-e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
|
|
-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
|
|
$< > $@-t
|
|
@CHMOD@ +x $@-t
|
|
@MV@ $@-t $@
|
|
|
|
# Don't update the files from bitkeeper
|
|
%::SCCS/s.%
|
|
|
|
all: fill_help_tables.sql make_win_src_distribution make_binary_distribution
|
|
|
|
# The following rule is here to ensure that build will continue
|
|
# even if we don't have perl installed. In this case the help tables
|
|
# will be empty
|
|
|
|
fill_help_tables.sql: fill_help_tables ../Docs/manual.texi
|
|
-./fill_help_tables < ../Docs/manual.texi > fill_help_tables.sql
|
|
echo "" >> fill_help_tables.sql
|