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
Don't use DBUG library for struct st_my_thread_var to make code less complicated.
Docs/manual.texi:
Cleanup
acinclude.m4:
Search after openssl in /usr/local
client/mysql.cc:
Fix prompt
client/mysqladmin.c:
Cleanup
client/mysqltest.c:
Cleanup
include/my_pthread.h:
Move thread variables to the right location
include/my_sys.h:
Move thread variables to the right location
include/mysql.h:
Clean up client prototypes
libmysql/libmysql.c:
Clean up client prototypes
mysys/my_static.h:
Cleanup
mysys/my_thr_init.c:
Don't use DBUG library for struct st_my_thread_var to make code less complicated
sql/item_cmpfunc.cc:
Small optimization
sql/net_pkg.cc:
Cleanup
sql/sql_parse.cc:
Allow VARCHAR(0)
client/mysql.cc:
new ctypes
client/mysqldump.c:
new ctypes
client/mysqltest.c:
new ctypes
client/sql_string.cc:
new ctypes
client/sql_string.h:
new ctypes
extra/mysql_install.c:
new ctypes
extra/replace.c:
new ctypes
extra/resolve_stack_dump.c:
new ctypes
extra/resolveip.c:
new ctypes
heap/hp_hash.c:
new ctypes
include/m_ctype.h:
new ctypes
include/my_sys.h:
new ctypes
isam/_key.c:
new ctypes
isam/_search.c:
new ctypes
libmysql/Makefile.shared:
new ctypes
libmysql/libmysql.c:
new ctypes
myisam/ft_dump.c:
new ctypes
myisam/ft_parser.c:
new ctypes
myisam/mi_test1.c:
new ctypes
mysys/charset.c:
new ctypes
mysys/default.c:
new ctypes
mysys/getvar.c:
new ctypes
mysys/hash.c:
new ctypes
mysys/mf_casecnv.c:
new ctypes
mysys/mf_dirname.c:
new ctypes
mysys/mf_format.c:
new ctypes
mysys/mf_iocache2.c:
new ctypes
mysys/mf_soundex.c:
new ctypes
mysys/mf_wfile.c:
new ctypes
mysys/my_error.c:
new ctypes
mysys/my_getwd.c:
new ctypes
mysys/my_init.c:
new ctypes
mysys/my_vsnprintf.c:
new ctypes
mysys/typelib.c:
new ctypes
sql/convert.cc:
new ctypes
sql/des_key_file.cc:
new ctypes
sql/field.cc:
new ctypes
sql/field.h:
new ctypes
sql/field_conv.cc:
new ctypes
sql/filesort.cc:
new ctypes
sql/ha_innodb.cc:
new ctypes
sql/hostname.cc:
new ctypes
sql/init.cc:
new ctypes
sql/item.cc:
new ctypes
sql/item_func.cc:
new ctypes
sql/item_strfunc.cc:
new ctypes
sql/item_sum.cc:
new ctypes
sql/item_timefunc.cc:
new ctypes
sql/key.cc:
new ctypes
sql/log.cc:
new ctypes
sql/mysql_priv.h:
new ctypes
sql/mysqld.cc:
new ctypes
sql/opt_range.cc:
new ctypes
sql/procedure.cc:
new ctypes
sql/slave.cc:
new ctypes
sql/sql_acl.cc:
new ctypes
sql/sql_analyse.cc:
new ctypes
sql/sql_base.cc:
new ctypes
sql/sql_cache.cc:
new ctypes
sql/sql_db.cc:
new ctypes
sql/sql_handler.cc:
new ctypes
sql/sql_lex.cc:
new ctypes
sql/sql_parse.cc:
new ctypes
sql/sql_show.cc:
new ctypes
sql/sql_string.cc:
new ctypes
sql/sql_string.h:
new ctypes
sql/sql_table.cc:
new ctypes
sql/sql_yacc.yy:
new ctypes
sql/table.cc:
new ctypes
sql/time.cc:
new ctypes
strings/Makefile.am:
new ctypes
strings/ctype-big5.c:
new ctypes
strings/ctype-czech.c:
new ctypes
strings/ctype-gbk.c:
new ctypes
strings/ctype-latin1_de.c:
new ctypes
strings/ctype-sjis.c:
new ctypes
strings/ctype-tis620.c:
new ctypes
strings/ctype.c:
new ctypes
strings/str2int.c:
new ctypes
strings/strto.c:
new ctypes
tools/mysqlmanager.c:
new ctypes
Fix bug when using option groups
libmysql/libmysql.c:
Fix bug when using option groups
myisam/myisamchk.c:
Portability fix
mysys/my_getopt.c:
Portability fix
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-all-build-steps:
Auto merged
Build-tools/Do-compile:
Auto merged
Build-tools/Do-rpm:
Auto merged
Docs/manual.texi:
Auto merged
include/hash.h:
Auto merged
include/my_sys.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/t/type_date.test:
Auto merged
mysys/array.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/mf_qsort.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
scripts/mysqlhotcopy.sh:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
strings/Makefile.am:
Auto merged
Fix for --enable-local-infile
Portability fix for bison
bdb/dist/s_recover:
Update for new POSIX spec
configure.in:
Fix for --enable-local-infile
libmysql/libmysql.c:
Cleanup
mysql-test/mysql-test-run.sh:
Update for new POSIX spec
scripts/safe_mysqld.sh:
Update for new POSIX spec
sql-bench/server-cfg.sh:
Update for new POSIX spec
sql/sql_yacc.yy:
Portability fix for bison
libmysql/libmysql.c:
Fixes a very rare bug when variable name (without '_') and it's
value are at the very end of the config file.
I have tested it , but would liek little mobster to test it further
mysql-test/r/union.result:
results for union test that proves that EXPLAIN UNION bugs are fixed
mysql-test/t/union.test:
additional tests for EXPLAIN on UNION's that have previously failed
sql/sql_yacc.yy:
Some small fixes for newer parsers.
Only unsigned int yystacksize remains to be fixed.
This I leave to Monty.
Present fixes are only aesthetic and do not harm.
BitKeeper/etc/logging_ok:
auto-union
acconfig.h:
Auto merged
Docs/manual.texi:
Auto merged
client/client_priv.h:
Auto merged
include/mysql.h:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
mysql-test/t/comments.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/unireg.cc:
Auto merged
sql/unireg.h:
Auto merged
Fixed data corruption bug in query cache.
Made queries be dependent of the database in use.
Docs/manual.texi:
Update binary log reference
client/mysql.cc:
Removed warning
include/thr_alarm.h:
Cleanup of alarm macros.
libmysql/libmysql.c:
Portabiliy fix
libmysql/net.c:
Cleanup of alarm macros.
mysql-test/t/rpl_get_lock.test:
Fixed results after merge.
mysys/my_bitmap.c:
Removed warning.
sql/log_event.cc:
Use thd->db_length
sql/mini_client.cc:
Cleanup of alarm macros.
sql/net_serv.cc:
Cleanup of alarm macros.
sql/sql_acl.cc:
Use thd->db_length
sql/sql_cache.cc:
Store used database together with the query.
sql/sql_class.cc:
Use thd->db_length
sql/sql_class.h:
Use thd->db_length
sql/sql_db.cc:
Use thd->db_length
sql/sql_parse.cc:
Use thd->db_length
sql/sql_udf.cc:
Use thd->db_length
Changed 'send_file_to_server' to use less stack (Fixed replication problem on OSF1).
Docs/manual.texi:
Changelog
libmysql/libmysql.c:
Changed 'send_file_to_server' to use less stack (Fixed some problems in threaded applications)
mysql-test/mysql-test-run.sh:
Fixed --sleep option
sql/mini_client.cc:
Changed 'send_file_to_server' to use less stack (Fixed replication problem on OSF1).
sql/mysqld.cc:
Destroy query cache properly
sql/sql_cache.cc:
Fixed bug in FLUSH QUERY CACHE
Docs/manual.texi:
Changelog
libmysql/libmysql.c:
Fixed bug with mysql_use_result() when mysql_query() is called before mysql_free_result().
mysql-test/r/group_by.result:
New tests
mysql-test/t/group_by.test:
New tests
sql/stacktrace.c:
Fix for SCO
Added new operators to be used with gcc 3.0.x
Update of query cache code.
Added semaphores for Windows (not yet in use)
Added pthread_mutex_trylock for windows.
not found by the client. This is especially important for PHP, which
only includes the latin1 character set in the bundled libmysql.
libmysql/libmysql.c:
Do not print a warning message when the server's character set is
not found by the client. (In this case, the client has always fallen
back on the default character set - this change just turns off the
warning.)
mysys/charset.c:
Pass flags in from the outside, instead of hard coding MY_WME, in
add_charset().
BitKeeper/etc/logging_ok:
auto-union
acinclude.m4:
Auto merged
libmysql/libmysql.c:
Auto merged
sql/share/french/errmsg.txt:
Auto merged
sql/share/german/errmsg.txt:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
sql/share/ukrainian/errmsg.txt:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/share/czech/errmsg.txt:
Auto merged
sql/share/danish/errmsg.txt:
Auto merged
sql/share/english/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/share/polish/errmsg.txt:
Auto merged
sql/share/portuguese/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
Docs/manual.texi:
Bad merge.
include/mysqld_error.h:
Merge with 3.23
Merged error messages with 3.23.44
Fixed bug with DATA DIRECTORY on windows
Docs/internals.texi:
Update coding policies
Docs/manual.texi:
Minor general corrections
acinclude.m4:
Fixed wrong cpu-test
configure.in:
Remove CPU test, because this makes unportable binaries.
include/mysql.h:
Added STDCALL to mysql_sever and mysql_thread variables
include/mysqld_error.h:
Merged error messages with 3.23.44
libmysql/libmysql.c:
Added STDCALL to mysql_sever and mysql_thread variables
libmysqld/lib_sql.cc:
Added STDCALL to mysql_sever and mysql_thread variables
sql-bench/limits/db2.cfg:
New limits file
sql-bench/test-select.sh:
Fixed bug in cache test
sql/share/czech/errmsg.txt:
Merged error messages with 3.23.44
sql/share/danish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/dutch/errmsg.txt:
Merged error messages with 3.23.44
sql/share/english/errmsg.txt:
Merged error messages with 3.23.44
sql/share/estonian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/french/errmsg.txt:
Merged error messages with 3.23.44
sql/share/german/errmsg.txt:
Merged error messages with 3.23.44
sql/share/greek/errmsg.txt:
Merged error messages with 3.23.44
sql/share/hungarian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/italian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/japanese/errmsg.txt:
Merged error messages with 3.23.44
sql/share/korean/errmsg.txt:
Merged error messages with 3.23.44
sql/share/norwegian-ny/errmsg.txt:
Merged error messages with 3.23.44
sql/share/norwegian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/polish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/portuguese/errmsg.txt:
Merged error messages with 3.23.44
sql/share/romanian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/russian/errmsg.txt:
Merged error messages with 3.23.44
sql/share/slovak/errmsg.txt:
Merged error messages with 3.23.44
sql/share/spanish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/swedish/errmsg.txt:
Merged error messages with 3.23.44
sql/share/ukrainian/errmsg.txt:
Merged error messages with 3.23.44
sql/sql_parse.cc:
Fix bug with DATA DIRECTORY on windows.
sql/sql_select.cc:
Cleanup
