sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Portability fixes
include/my_tree.h:
Add missing include file.
mysql-test/r/select.result:
Update results for new SHOW FULL COLUMNS
mysql-test/r/type_blob.result:
Update results for new SHOW FULL COLUMNS
mysql-test/r/type_float.result:
Update results for new SHOW FULL COLUMNS
mysql-test/r/type_ranges.result:
Update results for new SHOW FULL COLUMNS
mysql-test/t/heap_btree.test:
Update results for new SHOW FULL COLUMNS
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
BUILD/compile-pentium-debug:
Auto merged
BitKeeper/triggers/post-commit:
Auto merged
configure.in:
Auto merged
Docs/manual.texi:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/mysql_install.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
extra/resolveip.c:
Auto merged
include/my_sys.h:
Auto merged
include/mysqld_error.h:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql/Makefile.shared:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/ft_dump.c:
Auto merged
myisam/ft_test1.c:
Auto merged
myisam/ftdefs.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_test1.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysys/charset.c:
Auto merged
mysys/default.c:
Auto merged
mysys/hash.c:
Auto merged
sql/field.cc:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/hostname.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.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/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/share/italian/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/sql_update.cc:
Auto merged
sql/structs.h:
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
strings/Makefile.am:
Auto merged
strings/ctype-ujis.c:
Auto merged
tools/mysqlmanager.c:
Auto merged
BitKeeper/deleted/.del-rpl_empty_master_crash.result:
Delete: mysql-test/r/rpl_empty_master_crash.result
BitKeeper/deleted/.del-rpl_empty_master_crash.test:
Delete: mysql-test/t/rpl_empty_master_crash.test
configure.in:
Auto merged
include/my_net.h:
Auto merged
include/my_pthread.h:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/func_math.test:
Auto merged
mysys/my_gethostbyname.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_func.cc:
Auto merged
Change TRUNCATE(number) to truncate towards zero for negative numbers
Fix NULL handling for DESCRIBE table_name
Docs/manual.texi:
Update of TRUNCATE() information
configure.in:
Fix for HPUX
extra/resolveip.c:
Fix for SCO
include/my_net.h:
Fix for HPUX
libmysql/libmysql.c:
Removed warning on HPUX 10.20
mysql-test/r/func_math.result:
Test of new TRUNCATE handling
mysql-test/t/func_math.test:
Test of new TRUNCATE handling
mysys/my_gethostbyname.c:
Portability fix
sql/item_func.cc:
Change TRUNCATE(number) to truncate towards zero for negative numbers
sql/sql_show.cc:
Fix NULL handling for DESCRIBE table_name
of an error in option handling. This can sometimes be useful in
scripts.
Changed some exit code names and corresponding numbers.
Fixed a bug in mysqld.cc, in replication related options.
Added a global flag in my_getopt, which can be set by any program
that is using my_getopt, which tells whether the client should
print the error message itself, or whether my_getopt should do it.
The default is that my_getopt will print the error messages.
client/mysql.cc:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqladmin.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqlbinlog.cc:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqlcheck.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqldump.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqlimport.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqlmanager-pwgen.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqlmanagerc.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqlshow.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/mysqltest.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
client/thread_test.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
extra/my_print_defaults.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
extra/mysql_install.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
extra/perror.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
extra/resolve_stack_dump.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
extra/resolveip.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
include/my_getopt.h:
Added global (flag) variable which tells my_getopt whether to
print errors or just silently exit with proper error code.
include/mysys_err.h:
Changed exit code names and corresponding numbers.
isam/isamchk.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
isam/pack_isam.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
myisam/ft_dump.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
myisam/ft_eval.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
myisam/ft_test1.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
myisam/mi_test1.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
myisam/myisamchk.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
myisam/myisampack.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
mysys/my_getopt.c:
Changed exit code names and corresponding numbers. Added a flag
for checking whether my_getopt should print the error message,
or whether it should be printed by the client itself.
sql/gen_lex_hash.cc:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
sql/mysqld.cc:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
Fixed a bug when compiling in non-debug mode, some replication
related options were not enabled while they should be. This made
'make test' to fail in rpl000010 when --with-debug was not used.
tools/mysqlmanager.c:
Added useful exit error code for programs using my_getopt in case
of an error in option handling. This can sometimes be useful in
scripts.
BitKeeper/etc/logging_ok:
auto-union
BUILD/SETUP.sh:
Auto merged
Docs/manual.texi:
Auto merged
extra/resolveip.c:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/t/type_enum.test:
Auto merged
mysys/mf_strip.c:
Auto merged
mysys/raid.cc:
Auto merged
include/my_net.h:
merge
mysql-test/r/type_enum.result:
merge
mysql-test/t/type_decimal.test:
merge
mysys/Makefile.am:
merge
sql/sql_db.cc:
merge
sql/sql_parse.cc:
merge
Remove end space from ENUM and SET strings
mysql-test/t/type_enum.test:
Test of end space in enum's
Docs/manual.texi:
Changelog
include/my_sys.h:
Renamed stripp_sp -> strip_sp
mysql-test/r/type_enum.result:
Test of end space in enums
mysys/Makefile.am:
change stripp_sp -> strip_sp
mysys/mf_strip.c:
change stripp_sp -> strip_sp
sql/sql_db.cc:
change stripp_sp -> strip_sp
sql/sql_parse.cc:
change stripp_sp -> strip_sp
Remove end space from ENUM and SET strings
Fixed some portability things in my_gethostbyname_r
Portability fix for type_decimal.test
BUILD/SETUP.sh:
Fixes for gcc 3.1
extra/resolveip.c:
Cleanup
include/my_net.h:
Portability fix for SCO
mysql-test/t/type_decimal.test:
Portability fix for FreeBSD
mysys/Makefile.am:
Portability fix for OSF1
mysys/raid.cc:
Portability fix for OSF1
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
sql/item_strfunc.h:
merge layout fixing
sql/sql_update.cc:
merge layout fixing
include/my_base.h:
Fix to ensure that old tables works in 4.1
myisam/mi_open.c:
cleanup
mysys/my_handler.c:
Fixed problem in fulltest testcase
sql/spatial.cc:
cleanup
sql/sql_table.cc:
cleanup
Fixed bug in new code for regexp LIKE NULL
BUILD/SETUP.sh:
Fixes for gcc 3.1
BUILD/compile-solaris-sparc-debug:
Fixes for gcc 3.1
BUILD/compile-solaris-sparc-purify:
Fixes for gcc 3.1
BUILD/compile-solaris-sparc:
Fixes for gcc 3.1
Docs/manual.texi:
Fixed typo
include/violite.h:
Fixes for gcc 3.1
mysql-test/r/func_concat.result:
Updated test results
sql/item_cmpfunc.cc:
Fixed bug in new code for regexp LIKE NULL
_mi_compare_text -> mi_compate_text
Changes according Monty's suggestions
heap/heapdef.h:
BTREE heap key structure is now the same as MyISAM
heap/hp_delete.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_hash.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_open.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_rfirst.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_rkey.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_rlast.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_rnext.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_rprev.c:
BTREE heap key structure is now the same as MyISAM
heap/hp_write.c:
BTREE heap key structure is now the same as MyISAM
include/heap.h:
BTREE heap key structure is now the same as MyISAM
include/my_handler.h:
Removed hp_rb_key_cmp()
_mi_compare_text -> mi_compate_text
include/my_tree.h:
Fixed typo
myisam/ft_boolean_search.c:
_mi_compare_text -> mi_compate_text
myisam/ft_nlq_search.c:
_mi_compare_text -> mi_compate_text
myisam/ft_parser.c:
_mi_compare_text -> mi_compate_text
myisam/ft_stopwords.c:
_mi_compare_text -> mi_compate_text
myisam/ft_update.c:
_mi_compare_text -> mi_compate_text
mysys/my_handler.c:
Removed hp_rb_key_cmp()
_mi_compare_text -> mi_compate_text
mysys/tree.c:
BTREE heap key structure is now the same as MyISAM
sql/ha_heap.cc:
BTREE heap key structure is now the same as MyISAM
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
Changed some status variable names
Fix bug in GRANT ... PASSWORD string
Docs/manual.texi:
Update of variable names
include/my_net.h:
New my_gethostbyname_r() handling
include/my_pthread.h:
New my_gethostbyname_r() handling
libmysql/Makefile.shared:
New my_gethostbyname_r() handling
libmysql/libmysql.c:
New my_gethostbyname_r() handling
mysys/Makefile.am:
New my_gethostbyname_r() handling
mysys/my_pthread.c:
New my_gethostbyname_r() handling
mysys/my_thr_init.c:
New my_gethostbyname_r() handling
sql/hostname.cc:
New my_gethostbyname_r() handling
sql/mini_client.cc:
New my_gethostbyname_r() handling
sql/mysqld.cc:
change some status variable names
sql/sql_acl.cc:
Fix bug in GRANT ... PASSWORD string
- Fixed some bugs, wrongly freed pointers, in some clients.
- Removed unneccessary code.
- Fixed some other minor bugs and added some options into
variables category, which had accidently been left out earlier.
client/mysql.cc:
Fixed some wrong freed pointers. Removed unneccessary code.
Changed some types from GET_STR to GET_STRALC.
client/mysqladmin.c:
Fixed some wrong freed pointers. Removed unneccessary code.
Changed some types from GET_STR to GET_STRALC.
client/mysqlcheck.c:
Fixed some wrong freed pointers. Removed unneccessary code.
Changed some types from GET_STR to GET_STRALC.
client/mysqldump.c:
Fixed some wrong freed pointers. Removed unneccessary code.
Changed some types from GET_STR to GET_STRALC.
client/mysqlimport.c:
Removed unneccessary code.
Fixed a bug in option --ignore-lines
client/mysqlshow.c:
Removed unneccessary code.
include/my_getopt.h:
Added new type, GET_STRALC. The name stands for GET STRING ALLOC,
which means that the struct member value and u_max_value are
strings that must be alloced and freed when used.
The normal GET_STR works similarly otherwise, except that it's
arguments are just pointers to strings, not alloced ones.
mysys/my_getopt.c:
Added support for GET_STRALC
types, migrated mysqld.cc to use my_getopt.
include/my_getopt.h:
Added missing types; GET_INT, GET_UINT, GET_ULONG, GET_ULL
mysys/my_getopt.c:
- Fixed a bug in processing short options; variable value was set
wrongly after processing it in get_one_option(), when it needed
to be done before it.
- Fixed a bug in setting variable values; if type was OPT_ARG,
a call without argument destroyed the default value
- Added functionality for new GET_* types.
sql/mysqld.cc:
Changed mysqld.cc to use my_getopt.
build scripts work again.
BUILD/compile-pentium-max:
Added "--with-embedded-server" to have the libmysqld files included
in the source distribution when using "make dist"
Build-tools/Do-linux-build:
Only use the "--with-other-libc" parameter, if another libc actually
exists, since this will also force static linking, which does not work
together with OpenSSL
Makefile.am:
Removed hard-coded file name for TAR, let configure do this instead
(many systems actually ship GNU tar installed as "tar" instead of
"gtar")
configure.in:
Added check for GNU tar named "gtar", fall back to "tar" if "gtar"
was not found (and hope, that it's a GNU tar as well - this should
probably be checked more properly)
include/Makefile.am:
Added "my_semaphore.h" to pkginclude_HEADERS since it was missing
from the distribution
strings/Makefile.am:
Added "longlong2str.c" since it was missing from the distribution
support-files/mysql.server.sh:
Added LSB-compatible header info to make init script more portable
support-files/mysql.spec.sh:
- Use more RPM macros (e.g. infodir, mandir) to make the spec
file more portable
- reorganized the installation of documentation files: let RPM
take care of this
- reorganized the file list: actually install man pages along
with the binaries of the respective subpackage
- don't include libmysqld.a in the devel subpackage as well, if we
have a special "embedded" subpackage
- reworked the package descriptions
Docs/manual.texi:
Changlog
configure.in:
Change to version 3.23.51
Fix for OSF1
include/mysqld_error.h:
Added copyright message
isam/pack_isam.c:
Added copyright message
mysql-test/r/type_decimal.result:
New test results
mysql-test/t/type_decimal.test:
New test results
strings/Makefile.am:
Added mising file
Fix in test results
heap/hp_rfirst.c:
Index number argument
heap/hp_rlast.c:
Index number argument
heap/hp_test2.c:
Index number argument
include/heap.h:
Index number argument
mysql-test/r/heap_btree.result:
Test results fix
sql/ha_heap.cc:
Index number argument
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
BitKeeper/deleted/.del-identity.result~e41453a364242503:
Auto merged
BitKeeper/deleted/.del-identity.test~326f469b59105404:
Auto merged
include/my_pthread.h:
Auto merged
innobase/dict/dict0crea.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/include/univ.i:
Auto merged
innobase/lock/lock0lock.c:
Auto merged
innobase/pars/pars0opt.c:
Auto merged
innobase/que/que0que.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/sync/sync0sync.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
libmysql/libmysql.c:
Auto merged
myisam/myisampack.c:
Auto merged
mysql-test/t/func_test.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/my_pthread.c:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/greek/errmsg.txt:
Auto merged
sql/share/hungarian/errmsg.txt:
Auto merged
sql/sql_show.cc:
Auto merged
sql/share/italian/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
New file ctype-win1250ch, I forgot to commit it in my previous changes
include/m_ctype.h:
Some charsets require special hash function
mysys/hash.c:
Some charsets require special hash function
strings/ctype-utf8.c:
Some charsets require special hash function
strings/ctype.c:
Some charsets require special hash function
Also --with-libwrap is tested on Linux just fine.
configure.in:
Small fix for HP-UX 10.20 with DCE threads
include/my_pthread.h:
Small fix for HP-UX 10.20 with DCE threads
mysys/my_pthread.c:
Small fix for HP-UX 10.20 with DCE threads
Cleanup of LIBWRAP handling
Docs/manual.texi:
Changelog
include/my_pthread.h:
Fixed pthread_cond_timedwait() for HPUX and DCE threads
mysys/my_pthread.c:
Fixed pthread_cond_timedwait() for HPUX and DCE threads
sql/item_func.cc:
Fixed the GET_LOCK() works with HPUX and DCE threads
sql/mysqld.cc:
Cleanup of LIBWRAP handling
sql/sql_parse.cc:
Safety fix
include/hash.h:
Monty forgot to add H in left part of macros
mysys/hash.c:
I wonder how it happened that my_bool disappeared
sql/sql_acl.cc:
Somebody forgot )
sql/sql_class.h:
I wonder how it happened that this line disappeared
sql/sql_table.cc:
small typo
sql/sql_yacc.yy:
Having ; is more compatible
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/FINISH.sh:
Auto merged
BUILD/SETUP.sh:
Auto merged
BUILD/compile-pentium-debug:
Auto merged
acconfig.h:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
heap/hp_rfirst.c:
Auto merged
heap/hp_rnext.c:
Auto merged
include/my_sys.h:
Auto merged
include/myisam.h:
Auto merged
libmysql/Makefile.shared:
Auto merged
myisam/mi_write.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/heap.result:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/heap.test:
Auto merged
mysql-test/t/select_found.test:
Auto merged
mysql-test/t/union.test:
Auto merged
mysys/mf_iocache2.c:
Auto merged
mysys/my_vsnprintf.c:
Auto merged
sql/convert.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/structs.h:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
strings/Makefile.am:
Auto merged
