configure.in:
Auto merged
include/config-win.h:
Auto merged
include/thr_lock.h:
Auto merged
mysql-test/Makefile.am:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/log_event.cc:
merge
sql/mysqld.cc:
merge
Added new tests for better coverage of
min/max optimization code.
func_group.test:
Added new tests for better coverage of
min/max optimization code.
opt_sum.cc:
Fixed wrong previous manual merge.
Fixed bugs concerning fields used in min/max
functions for which there are conditions of
the form field=const.
sql/opt_sum.cc:
Fixed wrong previous manual merge.
Fixed bugs concerning fields used in min/max
functions for which there are conditions of
the form field=const.
mysql-test/t/func_group.test:
Added new test for better coverage of
min/max optimization code.
mysql-test/r/func_group.result:
Added new tests for better coverage of
min/max optimization code.
Insert constants with an explicit character set
ctype_many.result:
Fix according test change
mysql-test/r/ctype_many.result:
Fix according test change
mysql-test/t/ctype_many.test:
Insert constants with an explicit character set
mysql-test/r/bigint.result:
Auto merged
mysql-test/t/bigint.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/item.h:
merge (use local copy)
sql/sql_show.cc:
merge
Don't define crc32 if we are not linking with gzip
cmd-line-utils/libedit/libedit_term.h:
Rename: cmd-line-utils/libedit/term.h -> cmd-line-utils/libedit/libedit_term.h
BitKeeper/etc/ignore:
added scripts/make_win_src_distribution
client/connect_test.c:
Removed wrong include file
(my_global.h should never be included by an external client)
client/insert_test.c:
Removed wrong include file
(my_global.h should never be included by an external client)
client/select_test.c:
Removed wrong include file
(my_global.h should never be included by an external client)
cmd-line-utils/libedit/Makefile.am:
Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/el.h:
Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/key.h:
Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/makelist:
Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/read.c:
Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/readline.c:
Portability fixes (for HPUX11 and AIX)
cmd-line-utils/libedit/readline/readline.h:
Systems that has sys/cdefs may not have __BEGIN_DECLS
cmd-line-utils/libedit/sig.c:
sig_t is not portable
cmd-line-utils/libedit/sig.h:
sig_t is not portable
cmd-line-utils/libedit/term.c:
Portablity fixes
Fixed core dump when using a terminal without arrow key definitions
heap/_check.c:
Portability fix
heap/hp_hash.c:
Portability fix
heap/hp_rkey.c:
Portability fix
include/my_global.h:
Portability fixes for HPUX11
libmysql/libmysql.c:
Removed wrong cast
mysql-test/r/union.result:
New union tests
mysql-test/t/union.test:
New union tests
sql/gen_lex_hash.cc:
Fixed portability bug.
sql/gstream.h:
Portablity fix
sql/item_create.cc:
Don't define crc32 if we are not linking with gzip
sql/item_create.h:
Don't define crc32 if we are not linking with gzip
sql/item_func.cc:
Don't define crc32 if we are not linking with gzip
sql/item_func.h:
Don't define crc32 if we are not linking with gzip
sql/lex.h:
Don't define crc32 if we are not linking with gzip
sql/sql_show.cc:
Name can't be NULL
regarded as unsigned longlongss, not as floats. This make these values work
similar to values between 10000000000000000000 and 18446744073709551615.
mysql-test/r/bigint.result:
Fixed results for bigints
mysql-test/t/bigint.test:
Fixed results for bigints
sql/item.h:
Mark unsigned big ints as unsigned
sql/sql_lex.cc:
Returns numbers between 9223372036854775807 and 9999999999999999999 as unsigned 64 bit numbers
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BUILD/FINISH.sh:
Auto merged
client/mysqldump.c:
Auto merged
include/my_base.h:
Auto merged
include/my_pthread.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/ut/ut0mem.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/handler.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/innodb_handler.result:
Auto merged
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/bigint.test:
Auto merged
mysql-test/t/handler.test:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/innodb_handler.test:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.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/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/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
sql/table.h:
Auto merged
innobase/ibuf/ibuf0ibuf.c:
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/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_analyse.cc:
Auto merged
sql/sql_analyse.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/ukrainian/errmsg.txt:
Auto merged
mysql-test/t/rpl000015.slave-mi:
Auto merged
mysql-test/t/rpl_rotate_logs.slave-mi:
Auto merged
mysql-test/mysql-test-run.sh:
merge with 3.23
scripts/make_binary_distribution.sh:
merge with 3.23
sql/share/czech/errmsg.txt:
merge with 3.23
sql/share/danish/errmsg.txt:
merge with 3.23
sql/share/dutch/errmsg.txt:
merge with 3.23
sql/share/estonian/errmsg.txt:
merge with 3.23
sql/share/swedish/errmsg.txt:
merge with 3.23
sql/sql_class.cc:
merge with 3.23 (Keep local copy)
Increased some tests' robustness a bit :
- Added RESET MASTER to all tests who do SHOW BINLOG EVENTS, to make them independent from previous tests.
- Added save_master_pos to these tests to wait for the slave to start before purging its binary logs.
mysql-test/r/rpl_log.result:
Updated SHOW BINLOG EVENTS's positions as Monty lengthened std_data/words.dat by 500 bytes.
mysql-test/r/rpl_temporary.result:
Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test.
mysql-test/r/rpl_user_variables.result:
Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test.
mysql-test/t/rpl_log.test:
Added save_master_pos to wait for the slave to have started before purging its binary logs.
Otherwise, we could purge before the slave finishes starting, and then the slave could log events implicitly provoked by previous tests.
mysql-test/t/rpl_temporary.test:
Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test.
mysql-test/t/rpl_user_variables.test:
Added RESET MASTER to make positions shown by SHOW BINLOG EVENTS independent of any previous test.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
(SCRUM)
mysql-test/r/func_time.result:
result of test default_week_format
mysql-test/t/func_time.test:
test of default_week_format
sql/mysqld.cc:
add option default-week-format
sql/set_var.cc:
add system variable default_week_format
sql/sql_class.h:
add default_week_format into structure system_variables
sql/sql_yacc.yy:
change lex of week() with one parameter
into sanja.is.com.ua:/home/bell/mysql/work-qc-4.1
mysql-test/r/innodb_cache.result:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/my_pthread.h:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/libmysqld.c:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/rpl000001.result:
Auto merged
mysql-test/r/rpl000004.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl000001.test:
Auto merged
mysys/my_init.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/structs.h:
Auto merged
Makefile.am:
Merge with 4.0.11
mysql-test/mysql-test-run.sh:
Merge with 4.0.11
mysql-test/r/rpl_log.result:
Use local version (needs to be updated)
mysql-test/t/type_blob.test:
Merge with 4.0.11
sql/mysqld.cc:
Merge with 4.0.11
sql/protocol.cc:
Use local version
Fixed problem with LIKE and BINARY
BitKeeper/etc/ignore:
added scripts/fill_help_tables
client/mysqltest.c:
Better error messages
libmysql/libmysql.c:
Simple code cleanup
Simplified connect() and change_user() by using sub function
libmysqld/lib_sql.cc:
Ensure that new fields in MYSQL_FIELD structure is used
mysql-test/r/rpl_user_variables.result:
Cleaned up test
mysql-test/r/type_blob.result:
New test
mysql-test/t/rpl_user_variables.test:
Cleaned up test
mysql-test/t/type_blob.test:
New test
sql/item.cc:
Fixed that Item_ref returns the right character set
sql/item_cmpfunc.cc:
Fixed problem with LIKE and BINARY
sql/item_func.cc:
Don't store end ASCII(0) for string user variables
(Made some other code easier)
sql/log_event.cc:
Don't store end ASCII(0) for string user variables.
Fixed comment style
Some optimizations
sql/log_event.h:
Optimized type
sql/mini_client.cc:
Indentation changes
sql/mysql_priv.h:
Made is_update_query extern
sql/protocol.cc:
Simple code cleanup
sql/sql_acl.cc:
Code cleanup
Fixed problem when connecting to user without a password.
sql/sql_lex.h:
Fixed problem with uninitialized memory
sql/sql_parse.cc:
Fixed problem with user without passwords
Fixed some connect problems.
sql/time.cc:
removed reference to uninitialized memory
UNION's bug fixes and code clean-up
mysql-test/r/subselect.result:
An insignificant consequent of my UNION"s clean-up
sql/sql_derived.cc:
Fix a bug that our CTO reported
sql/sql_lex.h:
Fixing some bugs in UNION's with code clean-up
sql/sql_union.cc:
Fixing some bugs in UNION's with code clean-up
sql/sql_yacc.yy:
Fixing some bugs in UNION's with code clean-up
Portability fixes
Added new client function: mysql_get_server_version()
New server help code (From Victor Vagin)
Fixed wrong usage of binary()
Disabled RTREE usage for now.
BitKeeper/etc/ignore:
added scripts/fill_help_tables.sql
client/mysql.cc:
Some fixes when using 'help'
cmd-line-utils/libedit/compat.h:
Portability fix
cmd-line-utils/libedit/fgetln.c:
Portability fix
include/mysql.h:
Added new client function: mysql_get_server_version()
libmysql/libmysql.c:
Added new client function: mysql_get_server_version()
libmysqld/libmysqld.c:
Fixed prototype
mysql-test/install_test_db.sh:
Added creation of help tables
mysql-test/r/connect.result:
Added help tables
mysql-test/r/myisam.result:
Test of RTREE index
mysql-test/r/type_ranges.result:
updated results
mysql-test/t/myisam.test:
Test of RTREE index
mysql-test/t/type_ranges.test:
Updated test
mysys/charset.c:
Indentation change
mysys/my_symlink.c:
Removed compiler warning
scripts/fill_help_tables.sh:
Update for new help tables
sql/field.cc:
Indentation changes
sql/filesort.cc:
Optimized character set usage
sql/item_cmpfunc.cc:
Fix wrong usage of binary()
sql/item_cmpfunc.h:
Fix wrong usage of binary()
sql/item_func.cc:
Fix wrong usage of binary()
sql/item_func.h:
Fix wrong usage of binary()
sql/item_strfunc.cc:
Fix wrong usage of binary()
sql/item_sum.cc:
Fix wrong usage of binary()
sql/item_sum.h:
Fix wrong usage of binary()
sql/key.cc:
Indentation change
sql/lex.h:
HELP -> HELP_SYM
sql/mysql_priv.h:
Make get_field() more general
sql/password.c:
Indentation change + variable initialisation moved
sql/sql_acl.cc:
Make get_field() more general
sql/sql_base.cc:
Added comments + assertion for double call to mysql_lock_tables
sql/sql_cache.cc:
Indentation changes
sql/sql_class.h:
Added need_strxnfrm to SORT_FIELD to be able to optimise character set handling in filesort
sql/sql_derived.cc:
Renamed variables
sql/sql_help.cc:
New help functions (from Victor Vagin)
sql/sql_lex.cc:
Removed variables that doesn't have to be initialized for each query
sql/sql_lex.h:
Removed not used variable (olap)
sql/sql_parse.cc:
Fixed (not fatal) access of unitialized memory
Indentation / code cleanup
sql/sql_prepare.cc:
Indentaion cleanup
sql/sql_table.cc:
Disabled RTREE until 5.0
sql/sql_udf.cc:
Make get_field() more general
sql/sql_yacc.yy:
Removed access to uninitialized memory
Always set offset_limit and select_limit when using LIMIT (removed warnings)
Allow usage of 'help week'
sql/table.cc:
Make get_field() more general
More comments
sql/table.h:
Fixded type of TABLE_LIST->derived
sql/time.cc:
Stricter date / datetime handling (to be able to handle timestamps with days and microseconds)
strings/ctype-bin.c:
Added cha
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-configure.in~ac795a92c8fe049c:
Auto merged
include/my_sys.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/count_distinct.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
configure.in:
Auto merged
mysql-test/t/explain.test:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item_create.cc:
Auto merged
sql/item_create.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
Don't make OLD_PASSWORD() a reserved word
mysql-test/r/explain.result:
Test select count(*)
mysql-test/r/func_crypt.result:
Test old_password()
mysql-test/t/explain.test:
Test select count(*)
mysql-test/t/func_crypt.test:
Test old_password()
sql/item_create.cc:
Don't make OLD_PASSWORD() a reserved word
sql/item_create.h:
Don't make OLD_PASSWORD() a reserved word
sql/lex.h:
Don't make OLD_PASSWORD() a reserved word
sql/opt_range.cc:
Remove blank space
sql/opt_sum.cc:
Fix problem in MIN/MAX optimisation
BitKeeper/etc/ignore:
added support-files/MacOSX/Info.plist
Makefile.am:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/order_by.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
sql/filesort.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/lex.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
configure.in:
Use local version
mysql-test/r/func_group.result:
merge
mysql-test/r/order_by.result:
merge
mysql-test/r/show_check.result:
merge
mysql-test/t/func_group.test:
merge
mysql-test/t/join.test:
merge
sql/mysql_priv.h:
Use local version
sql/sql_yacc.yy:
merge
sql/table.cc:
USe local
Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files
configure.in:
After merge fixes
include/ft_global.h:
Fixed copyright
include/my_sys.h:
Remove compiler warnings
include/mysql.h:
Added lengths for all MYSQL_FIELD string parameters
include/mysql_com.h:
Remove compiler warning
myisam/ft_boolean_search.c:
Removed compiler warnings
myisam/ft_dump.c:
Removed compiler warnings
myisam/ft_stopwords.c:
Copy file from MySQL 4.0
myisam/mi_delete.c:
Fixed compiler warning
myisam/sort.c:
Indentation changes
myisam/sp_test.c:
Remove compiler warnings
mysql-test/r/func_group.result:
After merge fixes
mysql-test/r/group_by.result:
After merge fixes
mysql-test/r/rpl_insert_id.result:
After merge fixes
mysql-test/r/rpl_master_pos_wait.result:
After merge fixes
mysql-test/t/rpl000009.test:
After merge fixes
mysql-test/t/rpl_insert_id.test:
After merge fixes
mysql-test/t/subselect.test:
After merge fixes
sql/item_cmpfunc.cc:
After merge fixes
sql/item_cmpfunc.h:
After merge fixes
sql/item_func.cc:
After merge fixes
sql/item_func.h:
After merge fixes
sql/item_strfunc.cc:
After merge fixes
sql/item_strfunc.h:
After merge fixes
sql/log.cc:
After merge fixes
sql/mysql_priv.h:
After merge fixes
sql/mysqld.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
sql/sql_parse.cc:
After merge fixes
sql/sql_show.cc:
After merge fixes
sql/sql_udf.cc:
After merge fixes
sql/table.cc:
Changed field length to 2 byte in .frm files
sql/unireg.cc:
Changed field length to 2 byte in .frm files
