BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-Makefile.am:
Delete: Docs/Images/Makefile.am
Build-tools/Bootstrap:
Auto merged
Docs/Makefile.am:
Auto merged
configure.in:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysys/default.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/log.cc:
Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_table.cc:
Auto merged
client/mysqldump.c:
merge with 4.0
(This only reorders options)
sql/ha_innodb.cc:
merge with 4.0 (Keep original code)
sql/time.cc:
Note that part of this patch is done in my_time.c
in the source tar-ball for distribution. This is done by using the "DISTFILES" macro
in a new "Docs/Images/Makefile". As the source BK tree does not contain these files,
they are copied from the "mysqldocs" tree at release build time.
This changeset relies on "bk commit - mysqldoc tree (joerg:1.2276)" of today.
Build-tools/Bootstrap:
Copy the relevant files with "Docs/Images" from the "mysqldocs" BK tree into the
build tree, ensuring that the "Makefile*" from the source BK tree are removed before.
Docs/Images/Makefile.am:
This dummy file is only needed to satisfy the Makefile hierarchy,
at release build time it will be replaced by its counterpart from the "mysqldocs" BK tree.
Docs/Makefile.am:
Include the new "Docs/Images/Makefile" in the Makefile hierarchy.
configure.in:
Ensure that the autotools will handle the new "Docs/Images/Makefile.am".
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-mytest-old.c~5237697b30cf59e4:
Auto merged
Build-tools/Bootstrap:
Auto merged
Build-tools/mysql-copyright:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
Auto merged
VC++Files/innobase/innobase.dsp:
Auto merged
client/mysql.cc:
Auto merged
include/my_global.h:
Auto merged
innobase/dict/dict0crea.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/mtr0log.h:
Auto merged
innobase/include/mtr0log.ic:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/ut0dbg.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/ut/ut0dbg.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql/Makefile.shared:
Auto merged
libmysql/conf_to_src.c:
Auto merged
libmysql/dll.c:
Auto merged
libmysql/errmsg.c:
Auto merged
libmysql/manager.c:
Auto merged
libmysql_r/Makefile.am:
Auto merged
myisam/mi_key.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/having.result:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/type_date.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/having.test:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/type_date.test:
Auto merged
mysql-test/t/type_float.test:
Auto merged
mysql-test/t/type_uint.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/Makefile.am:
Auto merged
sql/field.h:
Auto merged
sql/ha_heap.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/dutch/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/estonian/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/japanese/errmsg.txt:
Auto merged
sql/share/korean/errmsg.txt:
Auto merged
sql/share/norwegian-ny/errmsg.txt:
Auto merged
sql/share/norwegian/errmsg.txt:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/share/slovak/errmsg.txt:
Auto merged
sql/share/spanish/errmsg.txt:
Auto merged
sql/share/swedish/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
various distributions
Docs/Makefile.am:
- Honoured node name change in manual.texi FOSS->FLOSS
Makefile.am:
- actually add EXCEPTIONS to the source distribution
scripts/make_win_src_distribution.sh:
- add EXCEPTIONS to the Windows source distribution, too
file "EXCEPTIONS" and include it in the source and binary
distributions
Build-tools/mysql-copyright:
- remove COPYING and EXCEPTIONS from the commercial packages
Docs/Makefile.am:
- create the EXCEPTIONS file that includes the FOSS License exception
scripts/make_binary_distribution.sh:
- include EXCEPTIONS in the binary distribution, too.
support-files/mysql.spec.sh:
- add EXCEPTIONS to the server RPM
added to manual.texi - extract it from there instead.
BitKeeper/deleted/.del-INSTALL-WIN-SOURCE~8b030042cb95ca9:
Delete: INSTALL-WIN-SOURCE
Docs/Makefile.am:
- Create INSTALL-WIN-SOURCE from mysql.info
Docs/Makefile.am:
Auto merged
mysql-test/t/rpl_change_master.test:
Auto merged
mysys/my_getopt.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
support-files/mysql.spec.sh:
Auto merged
mysql-test/r/rpl_change_master.result:
merged - ul
after it was removed from manual.texi (where it was automatically
generated from).
Docs/Makefile.am:
- don't create COPYING.LIB anymore (was removed from manual.texi)
Makefile.am:
- Removed COPYING.LIB from the source distribution
scripts/make_binary_distribution.sh:
- Removed COPYING.LIB from the binary distribution
scripts/make_win_src_distribution.sh:
- Removed COPYING.LIB from the windows source distribution
support-files/mysql.spec.sh:
- Removed COPYING.LIB from the Server RPM
as this is a document that belongs to the mysqldoc tree, it needs to
be copied over manually (using the Bootstrap script), before doing an
official release distribution. The file Docs/internals.texi in this tree
is only a dummy file to keep "make dist" happy.
Build-tools/Bootstrap:
- overwrite the dummy internals.texi with the real one, when creating
the release source distribution with Bootstrap
Docs/Makefile.am:
- add internals.texi to the source distribution
BitKeeper/etc/logging_ok:
auto-union
scripts/make_win_src_distribution.old:
Merge rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution.old
BUILD/compile-pentium-debug-max:
Auto merged
BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86:
Auto merged
BitKeeper/deleted/.del-sel000001.test~9567c1646058cc:
Auto merged
Build-tools/Bootstrap:
Auto merged
Build-tools/Do-compile:
Auto merged
Docs/Makefile.am:
Auto merged
client/get_password.c:
Auto merged
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
extra/perror.c:
Auto merged
include/config-win.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
innobase/btr/btr0pcur.c:
Auto merged
innobase/buf/buf0buf.c:
Auto merged
innobase/buf/buf0flu.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/include/buf0buf.h:
Auto merged
innobase/include/log0recv.h:
Auto merged
innobase/include/row0sel.h:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/ut0mem.h:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/log/log0log.c:
Auto merged
innobase/mem/mem0pool.c:
Auto merged
innobase/os/os0file.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_extra.c:
Auto merged
myisam/mi_key.c:
Auto merged
myisam/myisamdef.h:
Auto merged
myisammrg/myrg_queue.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_latin1_de.result:
Auto merged
mysql-test/r/flush.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/grant_cache.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/rpl000018.result:
Auto merged
mysql-test/r/rpl_insert_id.result:
Auto merged
mysql-test/r/rpl_master_pos_wait.result:
Auto merged
mysql-test/r/rpl_relayspace.result:
Auto merged
mysql-test/r/select_safe.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/r/type_date.result:
Auto merged
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/alias.test:
Auto merged
mysql-test/t/ctype_latin1_de.test:
Auto merged
mysql-test/t/fulltext_left_join.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/join.test:
Auto merged
mysql-test/t/join_outer.test:
Auto merged
mysql-test/t/order_by.test:
Auto merged
mysql-test/t/range.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysql-test/t/rpl000018.test:
Auto merged
mysql-test/t/rpl_insert_id.test:
Auto merged
mysql-test/t/sel000100.test:
Auto merged
mysql-test/t/select_safe.test:
Auto merged
mysql-test/t/type_date.test:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
mysys/default.c:
Auto merged
mysys/mf_format.c:
Auto merged
mysys/my_getopt.c:
Auto merged
mysys/thr_lock.c:
Auto merged
mysys/tree.c:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/Makefile.am:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/nt_servc.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_repl.h:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
sql/uniques.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
vio/viosocket.c:
Auto merged
BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e:
merge
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
merge
acinclude.m4:
Merge with 4.0 (openssl patch)
client/mysqlbinlog.cc:
Merge with 4.0 in which we had added code from 4.1
(We are basicly only using the 4.1 code here)
configure.in:
Keep 4.1 file
heap/hp_open.c:
merge with 4.0
include/my_base.h:
merge with 4.0
include/my_global.h:
merge with 4.0
include/mysqld_error.h:
merge with 4.0
innobase/ha/ha0ha.c:
merge with 4.0
(Code should be same but we use indentaion from 4.0)
innobase/log/log0recv.c:
merge with 4.0
libmysql/libmysql.c:
Remove with 4.0 code that was ported from 4.1
libmysqld/lib_sql.cc:
merge with 4.0
myisam/mi_open.c:
Remove 4.0 specific code
myisam/myisamchk.c:
merge with 4.0
myisammrg/myrg_rkey.c:
merge with 4.0
mysql-test/r/alter_table.result:
May need to be fixed after merge
mysql-test/r/create.result:
May need to be fixed after merge
mysql-test/r/distinct.result:
May need to be fixed after merge
mysql-test/r/drop.result:
May need to be fixed after merge
mysql-test/r/fulltext.result:
May need to be fixed after merge
mysql-test/r/func_set.result:
May need to be fixed after merge
mysql-test/r/func_str.result:
May need to be fixed after merge
mysql-test/r/func_test.result:
May need to be fixed after merge
mysql-test/r/grant.result:
May need to be fixed after merge
mysql-test/r/group_by.result:
May need to be fixed after merge
mysql-test/r/handler.result:
May need to be fixed after merge
mysql-test/r/heap.result:
May need to be fixed after merge
mysql-test/r/innodb.result:
May need to be fixed after merge
mysql-test/r/insert.result:
May need to be fixed after merge
mysql-test/r/insert_select.result:
May need to be fixed after merge
mysql-test/r/key_diff.result:
May need to be fixed after merge
mysql-test/r/merge.result:
May need to be fixed after merge
mysql-test/r/myisam.result:
May need to be fixed after merge
mysql-test/r/order_by.result:
May need to be fixed after merge
mysql-test/r/query_cache.result:
May need to be fixed after merge
mysql-test/r/rpl_flush_log_loop.result:
May need to be fixed after merge
mysql-test/r/rpl_loaddata.result:
May need to be fixed after merge
mysql-test/r/rpl_log.result:
May need to be fixed after merge
mysql-test/r/rpl_log_pos.result:
May need to be fixed after merge
mysql-test/r/rpl_rotate_logs.result:
May need to be fixed after merge
mysql-test/r/select.result:
May need to be fixed after merge
mysql-test/r/union.result:
May need to be fixed after merge
mysql-test/r/user_var.result:
May need to be fixed after merge
mysql-test/t/alter_table.test:
merge with 4.0
mysql-test/t/create.test:
merge with 4.0
mysql-test/t/distinct.test:
merge with 4.0
mysql-test/t/drop.test:
merge with 4.0
mysql-test/t/flush.test:
merge with 4.0
mysql-test/t/fulltext.test:
merge with 4.0
mysql-test/t/func_set.test:
merge with 4.0
mysql-test/t/func_str.test:
merge with 4.0
mysql-test/t/func_test.test:
merge with 4.0
mysql-test/t/grant.test:
merge with 4.0
mysql-test/t/grant_cache.test:
merge with 4.0
mysql-test/t/innodb.test:
Add back EXPLAIN and SHOW KEYS statements, but make them independent of number of rows returned by InnoDB
mysql-test/t/insert.test:
merge with 4.0
mysql-test/t/insert_select.test:
merge with 4.0
mysql-test/t/merge.test:
merge with 4.0
mysql-test/t/query_cache.test:
merge with 4.0
mysql-test/t/rpl_flush_log_loop.test:
merge with 4.0
mysql-test/t/rpl_loaddata.test:
merge with 4.0
mysql-test/t/rpl_rotate_logs.test:
merge with 4.0
mysql-test/t/select.test:
merge with 4.0
mysql-test/t/symlink.test:
merge with 4.0
mysql-test/t/union.test:
merge with 4.0
mysys/charset.c:
merge with 4.0
scripts/mysql_fix_privilege_tables.sh:
merge with 4.0 (Add quoting for some variables)
sql/field.h:
merge with 4.0
sql/ha_innodb.cc:
merge with 4.0
sql/item_cmpfunc.cc:
merge with 4.0
sql/item_cmpfunc.h:
merge with 4.0
sql/item_func.h:
merge with 4.0
sql/item_strfunc.cc:
merge with 4.0
Fixed null handling with ELT()
sql/item_timefunc.h:
merge with 4.0
sql/lex.h:
merge with 4.0
sql/log.cc:
merge with 4.0
sql/log_event.cc:
Merge with 4.0
Cleanups:
- Indentation
- #endif comments
- Replace strmov() with *pos++= for two byte strings
- Moved variable declarations to start of functions
- Merged identical code (LOAD_EVENT)
- Added casts when subtracting pointers
Did a full diff between this and 4.0 to ensure that the file is correct after merge.
sql/log_event.h:
merge with 4.0
sql/mysql_priv.h:
merge with 4.0
sql/mysqld.cc:
merge with 4.0
sql/repl_failsafe.cc:
merge with 4.0
sql/set_var.cc:
merge with 4.0
sql/set_var.h:
merge with 4.0
sql/share/czech/errmsg.txt:
merge with 4.0
sql/share/danish/errmsg.txt:
merge with 4.0
sql/share/dutch/errmsg.txt:
merge with 4.0
sql/share/english/errmsg.txt:
merge with 4.0
sql/share/estonian/errmsg.txt:
merge with 4.0
sql/share/french/errmsg.txt:
merge with 4.0
sql/share/german/errmsg.txt:
merge with 4.0
sql/share/greek/errmsg.txt:
merge with 4.0
sql/share/hungarian/errmsg.txt:
merge with 4.0
sql/share/italian/errmsg.txt:
merge with 4.0
sql/share/japanese/errmsg.txt:
merge with 4.0
sql/share/korean/errmsg.txt:
merge with 4.0
sql/share/norwegian-ny/errmsg.txt:
merge with 4.0
sql/share/norwegian/errmsg.txt:
merge with 4.0
sql/share/polish/errmsg.txt:
merge with 4.0
sql/share/portuguese/errmsg.txt:
merge with 4.0
sql/share/romanian/errmsg.txt:
merge with 4.0
sql/share/russian/errmsg.txt:
merge with 4.0
sql/share/slovak/errmsg.txt:
merge with 4.0
sql/share/spanish/errmsg.txt:
merge with 4.0
sql/share/swedish/errmsg.txt:
merge with 4.0
sql/share/ukrainian/errmsg.txt:
merge with 4.0
sql/slave.cc:
Merge + some indentation fixes
sql/slave.h:
merge with 4.0
sql/sql_acl.cc:
merge with 4.0
Some end space removal to make it easier to do future merges
sql/sql_acl.h:
merge with 4.0
sql/sql_cache.cc:
merge with 4.0
sql/sql_class.h:
merge with 4.0
sql/sql_handler.cc:
merge with 4.0
sql/sql_lex.cc:
merge with 4.0
sql/sql_lex.h:
merge with 4.0
sql/sql_parse.cc:
merge with 4.0
sql/sql_repl.cc:
merge with 4.0
sql/sql_select.cc:
merge with 4.0
sql/sql_table.cc:
merge with 4.0
sql/sql_union.cc:
Merge with 4.0
Note that I couldn't find out how to merge OPTION_FOUND_ROWS handling so this has to be fixed later
sql/sql_yacc.yy:
merge with 4.0
Removed end space to make merge easier
vio/Makefile.am:
merge with 4.0
a node name was changed in manual.texi which resulted in a very large
ReadMe.txt file, as the generating script could not find the (renamed)
ending node. Fixed the ending node name in Docs/Makefile.am and the
Docs/Support/generate-text-files.pl Perl script to make sure this does
not happen again (I only discovered this because the Do-pkg script was
not able to add the ReadMe.txt to the Apple Disk image because it ran out
of disk space due to the size of the file)
Docs/Makefile.am:
- Fixed a node name that was changed in manual.texi and resulted in
the generation of a _very_ large ReadMe.txt file (down to the very end
of the manual, since the ending node was not found)
Docs/Support/generate-text-files.pl:
- added a safeguard: if the ending node was not found, abort with an error
to indicate that the generated text file might be too large (as it would
contain the whole manual, down from the starting node)
- made some cosmetical changes
instead of being an individual file to avoid redundancy
BitKeeper/deleted/.del-ReadMe.txt~bd880aa05a0baccd:
Delete: support-files/MacOSX/ReadMe.txt
Docs/Makefile.am:
- Generate the MacOS ReadMe.txt from the manual
support-files/MacOSX/Makefile.am:
- Added MacOS X ReadMe.txt to CLEANFILES now that it's being autogenerated
Fix for bug when using auto_increment column and LAST_INSERT_ID()
Makefile.am:
Auto merged
ltconfig:
Auto merged
innobase/btr/btr0cur.c:
Auto merged
sql/Makefile.am:
Auto merged
Docs/Makefile.am:
Merge with 3.23.56
Docs/manual.texi:
Merge with 3.23.56 (Replace manual with 'empty' document)
libmysql/libmysql.c:
Use local version
sql/log.cc:
Fix for bug when using auto_increment column and LAST_INSERT_ID()
sql/sql_base.cc:
Use local version
now maintained in a separate "mysqldoc" BK source tree) - it will be
replaced with the correct manual.texi when building the official
source distribution
- fixed automake error about reservedwords.texi by moving it to EXTRA_DIST
instead
Docs/Makefile.am:
- moved reservedwords.texi from info_TEXINFOS to EXTRA_DIST since it is
not a full-featured texi file and automake would complain about
"missing @setfilename"
Docs/manual.texi:
- replaced manual.texi with a dummy placeholder file (manual.texi is
now maintained in a separate "mysqldoc" BK source tree) - it will be
replaced with the correct manual.texi when building the official
source distribution
so it's part of the distribution (manual.texi includes this file)
It will be replaced with the correct one from the mysqldoc tree before
building the distribution
- removed generation and inclusion of MIRRORS file, since the mirror list
is no longer part of manual.texi anyway
- replaced YFLAGS with AM_YFLAGS in sql/Makefile.am to make automake happy
- Redirect standard error when checking for dpkg-architecture in ltconfig
to avoid error message showing during configuration
Docs/Makefile.am:
- added reservedwords.texi (which gets included by manual.texi)
- removed MIRRORS (mirror list is not part of the manual anymore)
Docs/reservedwords.texi:
- Updated wording a bit after adding it to the tree
Makefile.am:
- removed MIRRORS from EXTRA_DIST (it's not part of the manual anymore)
ltconfig:
- Redirect standard error when checking for dpkg-architecture
to avoid error message showing during configuration (thanks to
John Wythe for the patch)
sql/Makefile.am:
- replaced YFLAGS with AM_YFLAGS to make automake happy
merge.test - it was missed in the previous commit :(
manual.texi:
fixed bad auto-merge of OLAP manual
Docs/Makefile.am:
removed ../MIRROR target (mirror list is no longer in the manual)
Docs/Makefile.am:
removed ../MIRROR target (mirror list is no longer in the manual)
Docs/manual.texi:
fixed bad auto-merge of OLAP manual
mysql-test/t/merge.test:
merge.test - it was missed in the previous commit :(
Cleaned up internals.texi, changed tabs to spaces.
Docs/Makefile.am:
Added Makefile.am targets for internals.texi.
Docs/internals.texi:
Cleanups, replaced tabs with spaces.
New HEX() function.
Final (?) cleanup of des_encrypt() / des_decrypt().
Added missing files to Makefiles.
Docs/Makefile.am:
Add missing files
Docs/manual.texi:
Added information about HEX() and des_encrypt() / des_decrypt().
include/mysql_com.h:
Added FLUSH DES_KEY_FILE
myisam/ft_update.c:
Removed compiler warnings
mysql-test/mysql-test-run.sh:
Fixes needed for des_key tests.
mysql-test/r/func_crypt.result:
Moved crypt test from func_str to func_crypt
mysql-test/r/func_encrypt.result:
Moved crypt test from func_str to func_crypt
mysql-test/r/func_str.result:
Moved crypt test from func_str to func_crypt
mysql-test/t/func_crypt.test:
Moved crypt test from func_str to func_crypt
mysql-test/t/func_encrypt.test:
New tests
mysql-test/t/func_str.test:
Moved crypt test from func_str to func_crypt
sql/des_key_file.cc:
Changes needed for FLUSH DES_KEY_FILE
sql/item_create.cc:
New HEX() function
sql/item_strfunc.cc:
Changes needed for FLUSH DES_KEY_FILE
sql/item_strfunc.h:
New HEX() function
sql/item_timefunc.cc:
cleanup
sql/lex.h:
FLUSH DES_KEY_FILE
sql/mysql_priv.h:
FLUSH DES_KEY_FILE
sql/mysqld.cc:
FLUSH DES_KEY_FILE
sql/sql_parse.cc:
Cleanup sql_yacc.yy
sql/sql_yacc.yy:
Cleanup sql_yacc.yy
mysql.server is a script, not data.
Docs/Makefile.am:
Use INSTALL_DATA instead of cp
libmysql/Makefile.am:
Use INSTALL_DATA instead of cp
mysql-test/Makefile.am:
Use INSTALL_DATA instead of cp
sql-bench/Makefile.am:
Use INSTALL_DATA instead of cp
support-files/Makefile.am:
mysql.server is a script, not data.
Fixed a small bug.. comment was being overwritten.
Docs/Support/test-make-manual
Will now fix it's own dependencies.. includes checking out files
and creating it's own include.texi.
Docs/Makefile.am:
Fixed small bug, comment was not being included. ;)
Docs/Support/test-make-manual:
test-make-manual will now fix it's own dependencies.
This is useful for those of us who don't have all files in the
repository checked out all the time.
Fixed bug when deleting keys with possible NULL values
many changes to mysqltest
Docs/Makefile.am:
Don't print warnings when making ..dvi
Docs/manual.texi:
Documented changes
acinclude.m4:
Fixed bug in detecting BDB version 3.2.3g
client/mysqltest.c:
Added TODO
Cleanups
Free all memory and close all files on exit
configure.in:
New release
include/my_sys.h:
Added new function needed for mysqltest.c
myisam/mi_create.c:
Cleanup
myisam/mi_delete.c:
Fixed bug when deleting keys with NULL
myisam/mi_search.c:
cleanup
myisam/myisamchk.c:
Added info about fulltext to -D
mysql-test/mysql-test-run.sh:
Use less memory for mysqld
Don't remove timefile if only testing one test
Send option --debug to mysqltest
mysql-test/r/fulltext.result:
New tests
mysql-test/r/func_math.result:
Make test portable
mysql-test/t/fulltext.test:
New tests
mysql-test/t/func_math.test:
Make test portable
mysys/mf_iocache2.c:
Fixed bug when reading over buffers
mysys/string.c:
Added new function needed for mysqltest.c
mysys/typelib.c:
cleanup
scripts/make_binary_distribution.sh:
Added option suffix
Removed some warnings for missing files
scripts/mysql_install_db.sh:
Fixed type
scripts/safe_mysqld.sh:
Also read options from 'server' group
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
New benchmark run
sql-bench/bench-init.pl.sh:
Added missing option '--silent'
sql/mysqld.cc:
Added warnings
Print backtraces even if 'current_thd' is not active
support-files/mysql.spec.sh:
Removed duplicate entry
fix to make ENCRYPT work
BUILD/compile-pentium-debug
debug has different warnings
BUILD/FINISH.sh
save symbol table and dissassembled code with symobls available before strip
use $do_make for make decision instead of $make to avoid conflict
BUILD/SETUP.sh
export AM_MAKEFLAGS
fast is now -fno-omit-frame-pointer, the opposite is now called
reckless
configure.in
fixes to make CRYPT work again
Docs/Makefile.am
hack to avoid rebuilding the manual on make clean -why does
Makefile depend on $BUILD_SOURCES, and do we even need BUILD_SOURCES?
BUILD/FINISH.sh:
save symbol table and dissassembled code with symobls available before strip
use $do_make for make decision instead of $make to avoid conflict
BUILD/SETUP.sh:
export AM_MAKEFLAGS
fast is now -fno-omit-frame-pointer, the opposite is now called
reckless
BUILD/compile-pentium-debug:
debug has different warnings
BitKeeper/etc/ignore:
Added mysqld.S mysqld.sym to the ignore list
Docs/Makefile.am:
hack to avoid rebuilding the manual on make clean -why does
Makefile depend on $BUILD_SOURCES, and do we even need BUILD_SOURCES?
acconfig.h:
fix to make ENCRYPT work
configure.in:
fixes to make CRYPT work again
Do-patch-file Update for new web structure
Makefile.am Added dependency for manual_toc.html
Makefile.am Replaced chmod with RM to avoid error message
include/Makefile.am:
Replaced chmod with RM to avoid error message
Docs/Makefile.am:
Added dependency for manual_toc.html
Build-tools/Do-patch-file:
Update for new web structure
support-files/mysql.spec.sh:
Don't install BDB
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Docs/Makefile.am:
Don't try to get the manual from SCCS
Docs/manual.texi:
Added bdb_lock_max + some information about Linux and big files
myisam/myisamchk.c:
Code cleanup
mysql.proj:
updated
sql/field.cc:
Added compare of packed BDB key
sql/field.h:
Added compare of packed BDB key
sql/ha_berkeley.cc:
Added compare of packed BDB keys and bdb_lock_max variable
sql/ha_berkeley.h:
Added bdb_lock_max variable
sql/key.cc:
cleanup
sql/mysqld.cc:
Added bdb_lock_max
Docs/Makefile.am Do not compile manual.pdf if pdftex not present
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Docs/Makefile.am:
Do not compile manual.pdf if pdftex not present
configure.in:
Add check for pdftex
PDF Manual now has Indexes.
Docs/manual.texi:
Added stub and conditionals for removing GPL and LGPL from NuSphere
manual.
Docs/Makefile.am:
PDF Manual now has Indexes
Docs/manual.texi:
Added stub and conditionals for removing GPL and LGPL from NuSphere
manual.
Docs/Makefile.am:
removed print-manual.pdf
added nusphere.pdf
Docs/manual.texi:
cleaned up the header a bit
added conditionals for nusphere.pdf
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
scripts/make_binary_distribution.sh:
Change mode to -rw-rw-r--
scripts/mysql_convert_table_format.sh:
Change mode to -rw-rw-r--
scripts/mysql_find_rows.sh:
Change mode to -rw-rw-r--
scripts/mysql_setpermission.sh:
Change mode to -rw-rw-r--
scripts/mysql_zap.sh:
Change mode to -rw-rw-r--
scripts/mysqlaccess.sh:
Change mode to -rw-rw-r--
scripts/mysqlbug.sh:
Change mode to -rw-rw-r--
scripts/mysqlhotcopy.sh:
Change mode to -rw-rw-r--
scripts/safe_mysqld-watch.sh:
Change mode to -rw-rw-r--
scripts/safe_mysqld.sh:
Change mode to -rw-rw-r--
scripts/mysqlaccess.conf:
Change mode to -rw-rw-r--
support-files/binary-configure.sh:
Change mode to -rw-rw-r--
Docs/Makefile.am:
Remove manual.ps when doing make distclean
Docs/manual.texi:
Fix
Makefile.am:
Fix that my_config.h is properly created and removed
include/Makefile.am:
Fix that my_config.h is properly created and removed
libmysql/Makefile.shared:
Add some distclean targets
scripts/Makefile.am:
Add some distclean targets
support-files/Makefile.am:
Add some distclean targets
Docs/Makefile.am:
Removed typo
Docs/internals.texi:
Added documentation about filesort
Docs/manual.texi:
Lots of changes, including information about the password in the mysql.user table
config.h.in:
***MISSING WEAVE***
heap/hp_rnext.c:
Fix of reading of read-next
include/config-win.h:
Fix for Ia64
include/global.h:
Fix for Ia64
include/my_base.h:
Fix for Ia64
include/myisam.h:
New repair options
isam/_dynrec.c:
Typo fixes
isam/_search.c:
Fix for Ia64
merge/rrnd.c:
Fix of ORDER BY for MERGE tables
myisam/ft_eval.c:
Fix for Ia64
myisam/ft_parser.c:
Fix for Ia64
myisam/ft_static.c:
Portability fixes
myisam/mi_check.c:
Fix for Ia64 + delay key creation
myisam/mi_locking.c:
Portability fixes
myisam/myisamdef.h:
Fixes for automatic table repair
myisam/myisampack.c:
Version number increment
myisammrg/myrg_rrnd.c:
Fix of ORDER BY for mymerge tables
mysql.proj:
Updated
mysys/charset.c:
Fix for Ia64
mysys/mf_casecnv.c:
Fix for Ia64
mysys/mf_pack.c:
Fix for Ia64
mysys/mf_path.c:
Fix for Ia64
mysys/mf_wfile.c:
Fix for Ia64
mysys/my_alloc.c:
Fix for Ia64
mysys/my_lib.c:
Fix for Ia64
mysys/my_lread.c:
Fix for Ia64
mysys/my_lwrite.c:
Fix for Ia64
mysys/my_winthread.c:
Fix for Ia64
mysys/string.c:
Fix for Ia64
mysys/thr_alarm.c:
Fix for Ia64
mysys/thr_rwlock.c:
Fix of scheduler bug for systems without rw_locks
regex/regcomp.c:
Fix for Ia64
regex/regex.h:
Fix for Ia64
regex/regex2.h:
Fix for Ia64
scripts/mysqlhotcopy.sh:
Explicit version number (because of bitkeeper)
sql-bench/bench-init.pl.sh:
New help message
sql-bench/server-cfg.sh:
Updates for postgreSQL 7.0
sql/ChangeLog:
Changelog
sql/field.cc:
Fix of datetime function handling
sql/filesort.cc:
More comments
sql/gen_lex_hash.cc:
More options
sql/ha_berkeley.cc:
Fix for part key reading
sql/ha_berkeley.h:
Indentation
sql/ha_myisam.cc:
Fix for delayed key creation
sql/ha_myisam.h:
Fix for delayed key creation
sql/handler.h:
Fix for delayed key creation
sql/item_func.cc:
Fix of crash when using constant expression with UDF functions in WHERE
sql/item_timefunc.cc:
Fix of datetime function handling
sql/mini_client.cc:
Portability fix
sql/mysql_priv.h:
Optimization of select initialization
sql/mysqld.cc:
Portability fixes, thread cache and min argument for connect_timeout
sql/sql_load.cc:
Delayed key handling
sql/sql_parse.cc:
Portability fixes and select initialization optimization
sql/sql_select.cc:
Small optimization + more comments
sql/sql_table.cc:
Fix default value adding to blob with alter table + delayed index creation
sql/sql_yacc.yy:
Optimized select initialization
sql/structs.h:
Fix for part key read
strings/ctype-sjis.c:
Fix for Ia64
strings/ctype-tis620.c:
Fix for Ia64
strings/t_ctype.h:
bk fix
support-files/mysql.spec.sh:
Added comment
vio/viotest-ssl.cc:
bk fix
vio/viotest-sslconnect.cc:
bk fix
vio/viotest.cc:
bk fix
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
