| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Remove Netware specific code.
|
|
|
|
|
|
|
|
|
|
| |
(make relies GNU extentions). The patch was partially
backport from 6.0.
Original comment:
bug#30708: make relies GNU extensions. Now that we no longer use
BitKeeper we can safely remove the SCCS handling with no loss of
functionality.
|
|\ |
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
are not created {Netware}
The init and test sql files were not created at cross-compilation time.
Now, make them in the default build rule. Additionally, remove the "fix"
SQL instructions, which are unnecessary for newly initialized databases.
Also, clean up the english in an error message, and BZRify nwbootstrap.
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into trift2.:/MySQL/M50/push-5.0
netware/Makefile.am:
Auto merged
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
1) Add a new top level "Makefile.am" target "make embedded-test".
2) Fix a syntax error (bad merge) in "netware/Makefile.am".
Makefile.am:
Add a new "make" target "embedded-test" so that it is easier
to test the "embedded server" ("libmyslqd").
Make it "phony".
Use it via a sub-make within "test-bt" to avoid code duplication.
netware/Makefile.am:
Cleanup: Macros "BUILT_SOURCES" and "CLEANFILES" should be defined only once.
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into trift2.:/MySQL/M51/push-5.1
netware/BUILD/compile-netware-END:
Auto merged
netware/Makefile.am:
Auto merged
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into trift2.:/MySQL/M51/netware2-5.1
netware/BUILD/compile-netware-END:
Auto merged
netware/Makefile.am:
Manual merge.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
to 5.0:
1) Ensure "init_db.sql" and "test_db-sql" really get built.
2) Ensure the "*.def" files with NetWare linker options get distributed to the proper directories.
netware/BUILD/compile-netware-END:
Ensure the "*.def" files are built for NetWare.
This is a backport of a 5.1 fix which may not be needed in 5.0 but cannot do any harm:
the general "link_sources" step might fall victim to a cleanup which would be fatal
just for NetWare, because of problems in the ordering of SUBDIR entries.
netware/Makefile.am:
1) The scripts "init_db.sql" and "test_db.sql" must be built in the NetWare phase.
2) Use "basename", not sed.
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
into trift2.:/MySQL/M51/push-5.1
netware/Makefile.am:
Auto merged
|
| |\ \ \ \
| | |/ / /
| |/| | /
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into trift2.:/MySQL/M51/netware-5.1
BitKeeper/deleted/.del-isamchk.def:
Auto merged
BitKeeper/deleted/.del-isamlog.def:
Auto merged
BitKeeper/deleted/.del-pack_isam.def:
Auto merged
netware/Makefile.am:
Auto merged
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
1) We do not provide the "isam" table handler in 5.0 and up (different from "myisam" !),
so we do not need the ".def" files for the "isam"-specific tools.
2) Use "basename" to get the base name of a file, not a harder-to-read sed expression.
BitKeeper/deleted/.del-isamchk.def:
Delete: netware/isamchk.def
BitKeeper/deleted/.del-isamlog.def:
Delete: netware/isamlog.def
BitKeeper/deleted/.del-pack_isam.def:
Delete: netware/pack_isam.def
netware/Makefile.am:
Use a plain "basename" showing the purpose, not a sed command which is harder to read.
|
|/ /
| |
| |
| |
| |
| |
| | |
netware/Makefile.am:
Distribute NetWare versions of "init_db.sql" and "test_db.sql".
netware/BUILD/compile-netware-END:
Make the "*.def" files available for linking.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into trift2.:/MySQL/M51/mysql-5.1
libmysqld/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
scripts/Makefile.am:
Auto merged
BitKeeper/deleted/.del-Makefile.am~2:
Auto merged
client/Makefile.am:
Merge does not fit - to be done manually.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
client/Makefile.am:
"Makefile" command lines must start with a tab, not with blanks.
libmysqld/Makefile.am:
"Makefile" command lines must start with a tab, not with blanks.
netware/Makefile.am:
"Makefile" command lines must start with a tab, not with blanks.
scripts/Makefile.am:
"Makefile" command lines must start with a tab, not with blanks.
win/Makefile.am:
After a backslash (to mark a continuation line) there must not be a trailing blank.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
configure.in:
Auto merged
include/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
client/Makefile.am:
Merge
netware/Makefile.am:
Merge
sql/Makefile.am:
Merge
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- Move the link_sources command from top level Makefile into each subdir
that need to link files
BitKeeper/etc/ignore:
Added libmysqld/link_sources libmysql/link_sources include/link_sources client/link_sources to the ignore list
Makefile.am:
Move link_sources down into each sub directory that might need it
client/Makefile.am:
Add "link_sources" to BUILT_SOURCES
configure.in:
Move link_sources down into each sub directory that might need it
include/Makefile.am:
Add "link_sources" to BUILT_SOURCES
libmysql/Makefile.am:
Add "link_sources" to BUILT_SOURCES
libmysql/Makefile.shared:
Add "link_sources" to BUILT_SOURCES
libmysqld/Makefile.am:
Add "link_sources" to BUILT_SOURCES
libmysqld/examples/Makefile.am:
Add "link_sources" to BUILT_SOURCES
netware/Makefile.am:
Add "link_sources" to BUILT_SOURCES
sql/Makefile.am:
Add "link_sources" to BUILT_SOURCES
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-comp_err.vcproj~45c167ae5ddd5a96:
Auto merged
BitKeeper/deleted/.del-gen_lex_hash.vcproj~544be6b6:
Auto merged
BitKeeper/deleted/.del-heap.vcproj~4382203ba03f4038:
Auto merged
BitKeeper/deleted/.del-myTest.vcproj~dba5adc4fad3c06:
Auto merged
BitKeeper/deleted/.del-my_print_defaults.vcproj~c8aa2bd86e13c3f9:
Auto merged
BitKeeper/deleted/.del-myisam_ftdump.vcproj~409c19b0274b7f8e:
Auto merged
BitKeeper/deleted/.del-myisamchk.vcproj~982ebe5673e58fb6:
Auto merged
BitKeeper/deleted/.del-myisamlog.vcproj~daa6596ea386e5a7:
Auto merged
BitKeeper/deleted/.del-myisampack.vcproj~3f7d4ec0cb56a9a0:
Auto merged
BitKeeper/deleted/.del-mysql.vcproj~f7bfe13a8836eea0:
Auto merged
BitKeeper/deleted/.del-mysql_client_test.vcproj~22188dcd372bc9de:
Auto merged
BitKeeper/deleted/.del-mysql_upgrade.vcproj~54815b7265120589:
Auto merged
BitKeeper/deleted/.del-mysqladmin.vcproj~178fa55cba442d50:
Auto merged
BitKeeper/deleted/.del-mysqlbinlog.vcproj~b2a5b1868f5d6596:
Auto merged
BitKeeper/deleted/.del-mysqlcheck.vcproj~7022581c8b8a7ea2:
Auto merged
BitKeeper/deleted/.del-mysqlclient.vcproj~e78a73e31368a44a:
Auto merged
BitKeeper/deleted/.del-mysqlimport.vcproj~5a30228ef641c081:
Auto merged
BitKeeper/deleted/.del-mysqlshow.vcproj~797d4fa322faa148:
Auto merged
BitKeeper/deleted/.del-mysqltest.vcproj~21878840704179ef:
Auto merged
BitKeeper/deleted/.del-perror.vcproj~86ad9dc660a048ad:
Auto merged
BitKeeper/deleted/.del-regex.vcproj~9dea9caafa801b26:
Auto merged
BitKeeper/deleted/.del-replace.vcproj~9620b1ced86e527a:
Auto merged
BitKeeper/deleted/.del-strings.vcproj~6d1126ae59e4bf82:
Auto merged
BitKeeper/deleted/.del-test1.vcproj~c474b4614c67e2d2:
Auto merged
BitKeeper/deleted/.del-test_libmysqld.vcproj~fb301d42d5c4e6f4:
Auto merged
BitKeeper/deleted/.del-thr_test.vcproj~fc0e15c1e6880160:
Auto merged
BitKeeper/deleted/.del-vio.vcproj~b7c21b4e2d6a9b85:
Auto merged
BitKeeper/deleted/.del-zlib.vcproj~9b1a681d56dae190:
Auto merged
extra/yassl/taocrypt/taocrypt.vcproj:
Auto merged
extra/yassl/yassl.vcproj:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/delayed.result:
Auto merged
mysql-test/r/loaddata.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/delayed.test:
Auto merged
mysql-test/t/init_connect.test:
Auto merged
mysql-test/t/loaddata.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
netware/Makefile.am:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj:
Auto merged
mysql-test/install_test_db.sh:
SCCS merged
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
netware/Makefile.am:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
NetWare builds.
netware/Makefile.am:
"libmysql.imp" must survive a "make clean" for the NetWare builds.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- Build sql files for netware from the mysql_system_tables*.sq files
- Fix comments about mysql_create_system_tables.sh
- Use mysql_install_db.sh to create system tables for mysql_test-run-shell
- Fix mysql-test-run.pl to also look in share/mysql for the msyql_system*.sql files
Changeset coded today by Magnus Svensson, just the application to 5.0.38 is by Joerg Bruehe.
BitKeeper/deleted/.del-init_db.sql~e2b8d0c8390e8023:
Delete: netware/init_db.sql
BitKeeper/deleted/.del-test_db.sql:
Delete: netware/test_db.sql
BitKeeper/etc/ignore:
Added netware/init_db.sql netware/test_db.sql to the ignore list
mysql-test/install_test_db.sh:
Use mysql_install_db from install_test_db(which is used by mysql-test-run-shell)
to install the system tables
mysql-test/mysql-test-run.pl:
Look for the mysql_system_tables*.sql also in share/mysql
netware/Makefile.am:
Build netware/init_db.sql and netware/test_db.sql from
the sources in scripts/msyql_system_tables*.sql
scripts/make_binary_distribution.sh:
netware/init_db.sql and netware/test_db.sql are now built by the Makefiles
from the scripts/mysql_system_tables*.sql files
sql/mysql_priv.h:
Update comment remindging to update the MySQL system table definitions
when adding a new SQL_MODE
sql/sql_acl.h:
Update comment reminding to update the MySQL System tables
when changing the ACL defines
|
|\ \ \ \
| | |/ /
| |/| /
| |_|/
|/| |
| | |
| | |
| | | |
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
netware/Makefile.am:
Auto merged
|
| |/
| |
| |
| |
| | |
netware/Makefile.am:
use detected awk variant instead of using awk directly
|
|\ \
| |/
| |
| |
| |
| |
| | |
into mysql.com:/home/kent/bk/mysql-5.1-build
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added "mysql_client_test.def"
mysql_client_test.def:
BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
netware/mysql_client_test.def:
BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
netware/Makefile.am:
Added "mysql_client_test.def"
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
into mysql.com:/home/kent/bk/mysql-5.1-build
client/mysqltest.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_trigger.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added new "mysql_upgrade.def" for Netware (bug#23504)
*.def:
Allocate 128K stack for all executables (bug#23504)
netware/comp_err.def:
Allocate 128K stack for all executables (bug#23504)
netware/isamchk.def:
Allocate 128K stack for all executables (bug#23504)
netware/isamlog.def:
Allocate 128K stack for all executables (bug#23504)
netware/libmysql.def:
Allocate 128K stack for all executables (bug#23504)
netware/my_print_defaults.def:
Allocate 128K stack for all executables (bug#23504)
netware/myisam_ftdump.def:
Allocate 128K stack for all executables (bug#23504)
netware/myisamchk.def:
Allocate 128K stack for all executables (bug#23504)
netware/myisamlog.def:
Allocate 128K stack for all executables (bug#23504)
netware/myisampack.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysql.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysql_install_db.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysql_test_run.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysql_waitpid.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqladmin.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqlbinlog.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqlcheck.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqld.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqld_safe.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqldump.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqlimport.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqlshow.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysqltest.def:
Allocate 128K stack for all executables (bug#23504)
netware/pack_isam.def:
Allocate 128K stack for all executables (bug#23504)
netware/perror.def:
Allocate 128K stack for all executables (bug#23504)
netware/replace.def:
Allocate 128K stack for all executables (bug#23504)
netware/resolve_stack_dump.def:
Allocate 128K stack for all executables (bug#23504)
netware/resolveip.def:
Allocate 128K stack for all executables (bug#23504)
netware/mysql_upgrade.def:
BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_upgrade.def
netware/Makefile.am:
Added "mysql_upgrade.def"
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
BitKeeper/etc/ignore:
auto-union
netware/Makefile.am:
Auto merged
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Create the file netware/libmysql.imp from libmysql/libmysql.def
- Remove the outdated netware/libmysql.imp file from version control
BitKeeper/deleted/.del-libmysql.imp:
Delete: netware/libmysql.imp
BitKeeper/etc/ignore:
Added netware/libmysql.imp to the ignore list
netware/Makefile.am:
Build libmysql.imp from libmysql/libmysql.def
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
into neptunus.(none):/home/msvensson/mysql/netware/my51-netware
netware/Makefile.am:
Auto merged
netware/BUILD/mwenv:
Merge 5.0 -> 5.1
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Make mwenv automatically adapt the setting to current build dir.
- Fix include paths that mwccnlm does not understand
- Link libmysl with yassl
netware/BUILD/mwccnlm:
Update mwccnlm to convert -I../.. to -I../../
netware/BUILD/mwenv:
Automatically detect current build dir and based on that calculate current build dir in winw format.
Allow caller to define MYDEV to override the defatul "F:/mydev"
Set all paths from these three variables
netware/Makefile.am:
Link libmysql with yassl_libs
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
sql/item_func.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
storage/ndb/Makefile.am:
Auto merged
tests/mysql_client_test.c:
Auto merged
BUILD/compile-dist:
SCCS merged
netware/Makefile.am:
SCCS merged
netware/BUILD/compile-netware-END:
SCCS merged
|
| |\
| | |
| | |
| | |
| | | |
BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Delete: netware/mysql_install.def
Makefile.am:
Removed obsolete "mysql_install.def"
netware/Makefile.am:
Removed obsolete "mysql_install.def"
BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571:
Delete: netware/mysql_install.def
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
configure.in:
To configure InnoDB for cross compilation.
include/config-netware.h:
NetWare specific change to fix the compilation errors caused by event.h
NetWare specific change required for WINE PATH and for new versions LibC(Jun 05)
and zlib(1.2.3)
netware/BUILD/compile-AUTOTOOLS:
Netware specific change reflecting the change in source code
directory structure.
netware/BUILD/compile-linux-tools:
Netware specific change to fix the location where gen_lex_hash
gets created. Fixed also directory structure reflecting changes.
netware/BUILD/compile-netware-END:
Netware specific change for creating mysqld_error.h
netware/BUILD/mwenv:
Netware specific change required for WINE PATH and for
new versions LibC(Jun 05) and zlib(1.2.3).
netware/BUILD/nwbootstrap:
NetWare Specific change to produce absoulte path for XDC file.
netware/Makefile.am:
Netware specific changes to fix to match new
directory structure.
netware/my_manage.h:
Netware specific change required for WINE PATH and for new versions
LibC(Jun 05) and zlib(1.2.3).
netware/mysql_test_run.c:
Netware specific change, added --autoclose option for mysql_test_run.nlm.
scripts/make_binary_distribution.sh:
Fix to reflect change in directory structure.
sql/mysqld.cc:
Stacksize change for Netware.
Netware specific change to fix the compilation errors caused by event.h
sql/set_var.cc:
Minor indending related fix.
sql/sql_class.cc:
Added #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION macro.
storage/innobase/os/os0thread.c:
Netware specific change to increase the thread stack size.
storage/myisam/mi_locking.c:
Enclosed MMAP related code under HAVE_MMAP preprocessor directive.
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
new file
VC++Files/mysql.sln:
Added "client/mysqlslap"
netware/Makefile.am:
Added "client/mysqlslap"
scripts/make_binary_distribution.sh:
Added "client/mysqlslap"
support-files/mysql.spec.sh:
Added "client/mysqlslap"
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Makefile.am:
Auto merged
client/Makefile.am:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
support-files/Makefile.am:
Auto merged
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Enable "make distcheck" to work
configure.in:
Enable "make distcheck" to work
Docs/Makefile.am:
Enable "make distcheck" to work
Makefile.am:
Enable "make distcheck" to work
client/Makefile.am:
Enable "make distcheck" to work
cmd-line-utils/libedit/Makefile.am:
Enable "make distcheck" to work
include/Makefile.am:
Enable "make distcheck" to work
libmysql/Makefile.am:
Enable "make distcheck" to work
libmysql_r/Makefile.am:
Enable "make distcheck" to work
libmysqld/Makefile.am:
Enable "make distcheck" to work
libmysqld/examples/Makefile.am:
Enable "make distcheck" to work
mysql-test/Makefile.am:
Enable "make distcheck" to work
ndb/docs/Makefile.am:
Enable "make distcheck" to work
netware/Makefile.am:
Enable "make distcheck" to work
pstack/Makefile.am:
Enable "make distcheck" to work
scripts/Makefile.am:
Enable "make distcheck" to work
sql-bench/Makefile.am:
Enable "make distcheck" to work
sql/Makefile.am:
Enable "make distcheck" to work
sql/share/Makefile.am:
Enable "make distcheck" to work
support-files/Makefile.am:
Enable "make distcheck" to work
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09:
Auto merged
BitKeeper/deleted/.del-Makefile.am~41238af048e60515:
Auto merged
mysql-test/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
tests/Makefile.am:
Auto merged
vio/Makefile.am:
SCCS merged
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
client/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
cmd-line-utils/libedit/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
dbug/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
extra/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
heap/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
isam/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
libmysql/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
libmysql_r/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
libmysqld/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
libmysqld/examples/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
merge/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
myisam/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
myisammrg/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
mysql-test/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
mysys/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
netware/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
regex/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
sql/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
strings/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
tests/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
vio/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
tools/Makefile.am:
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Removed references to ISAM and MERGE
netware/BUILD/compile-linux-tools:
Removed references to ISAM and MERGE
netware/Makefile.am:
Removed references to ISAM and MERGE
os2/ChangeLog.os2:
Removed references to ISAM and MERGE
os2/MySQL-Source.icc:
Removed references to ISAM and MERGE
os2/MySQL-Sql.icc:
Removed references to ISAM and MERGE
os2/MySQL-Util.icc:
Removed references to ISAM and MERGE
support-files/debian/gomi:
Removed references to ISAM and MERGE
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
BitKeeper/etc/logging_ok:
auto-union
Build-tools/mysql-copyright-2:
Auto merged
include/violite.h:
Auto merged
innobase/btr/btr0btr.c:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/buf/buf0flu.c:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0mem.c:
Auto merged
innobase/fsp/fsp0fsp.c:
Auto merged
innobase/fut/fut0lst.c:
Auto merged
innobase/ha/hash0hash.c:
Auto merged
innobase/include/buf0buf.ic:
Auto merged
innobase/include/buf0lru.h:
Auto merged
innobase/include/data0data.h:
Auto merged
innobase/include/dict0dict.h:
Auto merged
innobase/include/dict0mem.h:
Auto merged
innobase/include/fsp0fsp.h:
Auto merged
innobase/include/hash0hash.h:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/include/log0log.h:
Auto merged
innobase/include/log0log.ic:
Auto merged
innobase/include/mem0dbg.ic:
Auto merged
innobase/include/mem0pool.h:
Auto merged
innobase/include/mtr0mtr.h:
Auto merged
innobase/include/sync0rw.h:
Auto merged
innobase/include/sync0sync.h:
Auto merged
innobase/include/trx0roll.h:
Auto merged
innobase/include/trx0trx.h:
Auto merged
innobase/include/ut0mem.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/mem/mem0dbg.c:
Auto merged
innobase/mem/mem0pool.c:
Auto merged
innobase/mtr/mtr0mtr.c:
Auto merged
innobase/pars/lexyy.c:
Auto merged
innobase/pars/pars0opt.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/sync/sync0rw.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/thr/thr0loc.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
innobase/trx/trx0roll.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/usr/usr0sess.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
mysql-test/r/func_if.result:
Auto merged
mysql-test/r/type_date.result:
Auto merged
mysql-test/t/type_date.test:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
mysys/mf_tempfile.c:
Auto merged
netware/BUILD/nwbootstrap:
Auto merged
netware/Makefile.am:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
mysql-test/t/func_if.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
support-files/my-innodb-heavy-4G.cnf.sh:
Auto merged
Build-tools/Do-compile:
Merge with 4.0
Build-tools/mysql-copyright:
Merge with 4.0
client/mysqltest.c:
Merge with 4.0
include/my_global.h:
Merge with 4.0
innobase/buf/buf0rea.c:
Merge with 4.0
innobase/data/data0type.c:
Merge with 4.0
innobase/ibuf/ibuf0ibuf.c:
Merge with 4.0
innobase/include/buf0buf.h:
Merge with 4.0
innobase/include/data0type.h:
Merge with 4.0
innobase/include/mem0mem.h:
Merge with 4.0
innobase/include/mem0mem.ic:
Merge with 4.0
innobase/log/log0recv.c:
Merge with 4.0
libmysql/libmysql.c:
Merge with 4.0
libmysqld/Makefile.am:
Merge with 4.0
mysql-test/r/range.result:
Merge with 4.0
mysql-test/r/type_decimal.result:
Merge with 4.0
mysql-test/t/range.test:
Merge with 4.0
netware/BUILD/mwenv:
Merge with 4.0
netware/mysql_test_run.c:
Merge with 4.0
scripts/mysql_install_db.sh:
Merge with 4.0
sql/field.cc:
Merge with 4.0
sql/field.h:
Merge with 4.0
sql/item_cmpfunc.h:
Merge with 4.0
support-files/my-huge.cnf.sh:
Merge with 4.0
support-files/my-large.cnf.sh:
Merge with 4.0
support-files/my-medium.cnf.sh:
Merge with 4.0
support-files/my-small.cnf.sh:
Merge with 4.0
support-files/mysql.spec.sh:
Merge with 4.0
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Don't pass --user to mysqld if --user is not used
netware/Makefile.am:
Make it possible to use mysys functions in mysql_test_run.c
netware/mysql_test_run.c:
Make it possible to use mysys functions in mysql_test_run.c
scripts/mysql_install_db.sh:
Don't pass --user to mysqld if --user is not used
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
netware/Makefile.am:
Auto merged
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
use opt_net_buffer_length instead of net_buffer_length
Makefile.am:
netware files should always be in 'make dist'
client/mysqldump.c:
use opt_net_buffer_length instead of net_buffer_length
configure.in:
netware files should always be in 'make dist'
netware/Makefile.am:
netware files should always be in 'make dist'
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
configure.in:
Auto merged
Build-tools/Do-compile:
Auto merged
client/mysql.cc:
Auto merged
client/mysqladmin.c:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqlimport.c:
Auto merged
client/mysqlshow.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/thr_alarm.h:
Auto merged
innobase/include/trx0roll.h:
Auto merged
innobase/include/trx0trx.h:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
innobase/trx/trx0roll.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/usr/usr0sess.c:
Auto merged
isam/isamchk.c:
Auto merged
myisam/myisam_ftdump.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysys/default.c:
Auto merged
mysys/my_getopt.c:
Auto merged
mysys/my_init.c:
Auto merged
mysys/my_pthread.c:
Auto merged
netware/Makefile.am:
Auto merged
netware/init_db.sql:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
tools/mysqlmanager.c:
Auto merged
VC++Files/dbug/dbug.dsp:
Auto merged
VC++Files/heap/heap.dsp:
Auto merged
VC++Files/isam/isam.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/myisam/myisam.dsp:
Auto merged
VC++Files/myisammrg/myisammrg.dsp:
Auto merged
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
merge
client/mysqlbinlog.cc:
merge
extra/perror.c:
merge
include/mysql_com.h:
merge
libmysqld/Makefile.am:
merge
netware/BUILD/mwenv:
merge
sql/mysqld.cc:
merge
|