client/mysql.cc:
Auto merged
include/mysql.h:
Auto merged
include/violite.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
sql/field.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mf_iocache.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/set_var.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_handler.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/protocol.cc:
SCCS merged
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/net_serv.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
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_handler.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
libmysqld/libmysqld.c:
conflicts resolving
of SHOW CREATE TABLE 'name'. Depending on the mode, the output can
be compatible with various databases, including earlier versions of
MySQL
.
sql/field.cc:
Added support for sql_mode.
Changed find_set() to be aware of possible error. If the argument
contains a value that is not legal in the set, err_pos and err_len
are set.
sql/field.h:
Added support for sql_mode.
Changed find_set() to be aware of possible error. If the argument
contains a value that is not legal in the set, err_pos and err_len
are set.
sql/item_func.cc:
Added support for sql_mode.
sql/mysql_priv.h:
Some new sql modes.
sql/mysqld.cc:
Added support for sql mode, including some new modes.
sql/set_var.cc:
Added support for sql_mode.
Added function that can be used to check values in a set.
sql/set_var.h:
Added support for sql_mode.
Added function that can be used to check values in a set.
sql/sql_class.cc:
Removed previous usage of opt_sql_mode.
sql/sql_class.h:
Removed previous usage of opt_sql_mode.
sql/sql_lex.cc:
Changed previous version of sql_mode to the new noe.
sql/sql_parse.cc:
Changed previous version of sql_mode to the new noe.
sql/sql_select.cc:
Changed previous version of sql_mode to the new noe.
sql/sql_show.cc:
Added support for various sql_modes for printing CREATE TABLE.
sql/sql_yacc.yy:
Changed previous version of sql_mode to the new noe.
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
include/mysql.h:
Auto merged
include/mysql_com.h:
Auto merged
libmysqld/libmysqld.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/net_serv.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/slave.h:
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_error.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_help.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/log_event.cc:
Conflicts resolving
sql/log_event.h:
conflicts
sql/mysqld.cc:
conflicts
sql/opt_range.cc:
conflicts
sql/protocol.cc:
conflicts
sql/sql_show.cc:
conflicts
(Note: test 'union' fails, but Sanja promised to fix this)
include/m_ctype.h:
Changed prototype for strntod() to inform the user that source may be modified.
include/m_string.h:
Moved my_vsnprintf to strings library
include/my_sys.h:
Moved my_vsnprintf to strings library
libmysql/Makefile.shared:
Moved my_vsnprintf to strings library
mysql-test/r/alter_table.result:
Moved my_vsnprintf to strings library
mysql-test/r/create.result:
Moved my_vsnprintf to strings library
mysql-test/r/ctype_many.result:
Moved my_vsnprintf to strings library
mysql-test/r/fulltext.result:
Moved my_vsnprintf to strings library
mysql-test/r/innodb.result:
Moved my_vsnprintf to strings library
mysql-test/r/merge.result:
Moved my_vsnprintf to strings library
mysql-test/r/select.result:
Moved my_vsnprintf to strings library
mysql-test/r/show_check.result:
Moved my_vsnprintf to strings library
mysql-test/r/type_blob.result:
Moved my_vsnprintf to strings library
mysql-test/r/type_enum.result:
Moved my_vsnprintf to strings library
mysql-test/r/type_ranges.result:
Moved my_vsnprintf to strings library
mysql-test/r/type_set.result:
Moved my_vsnprintf to strings library
mysys/Makefile.am:
Moved my_vsnprintf to strings library
sql/field.cc:
Fixed for character set handling
sql/field.h:
Fixed for character set handling
sql/item.cc:
Fixed for character set handling
sql/item.h:
Fixed for character set handling
sql/item_func.cc:
Fixed for character set handling
sql/item_func.h:
Fixed for character set handling
sql/item_strfunc.cc:
Fixed for character set handling
sql/item_sum.cc:
Fixed for character set handling
sql/item_sum.h:
Fixed for character set handling
sql/item_timefunc.cc:
Fixed for character set handling
sql/mysqld.cc:
Update to use new test_if_int()
sql/opt_range.cc:
Fixed for character set handling
sql/procedure.h:
Fixed for character set handling
sql/sql_class.cc:
Fixed for character set handling
sql/sql_string.cc:
Added multi byte support to append.
Added set_latin1()
sql/sql_string.h:
Added set_latin1()
sql/sql_update.cc:
Cosmetic changes
strings/Makefile.am:
Moved my_vsnprintf to strings library
strings/ctype-simple.c:
Code review + cleanup
strings/ctype-utf8.c:
Fixed strntod()
strings/my_vsnprintf.c:
Added support for %#d and %#u
mysys/my_init.c:
Move my_once_free() up to not get warnings for this from safemalloc.
sql/item_row.cc:
Removed compiler warnings
sql/sql_select.cc:
split fix_tables_pointer() into two functions to be able to reuse code
sql/sql_select.h:
split fix_tables_pointer() into two functions to be able to reuse code
into sanja.is.com.ua:/home/bell/mysql/work-row-4.1
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/item.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
into eagle.mysql.r18.ru:/home/vva/work/BINLOG_TEMPORARY/4.1
BitKeeper/etc/logging_ok:
auto-union
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_table.cc:
Auto merged
mysql-test/r/subselect.result:
test of row IN subslect
mysql-test/t/subselect.test:
test of row IN subslect
sql/item.cc:
New helper Item - reference on item list by number
cache item for row
sql/item.h:
layout fixed
New helper Item - reference on item list by number
cache item for row
sql/item_cmpfunc.cc:
changed Item_in_optimizer to be able work with row
sql/item_cmpfunc.h:
changed Item_in_optimizer to be able work with row
sql/item_row.cc:
Fixed row Item to be compatible with row subselect
sql/item_row.h:
Fixed row Item to be compatible with row subselect
sql/item_subselect.cc:
changed name of class to corerectly reflex its function
row IN subselect
sql/item_subselect.h:
changed name of class to corerectly reflex its function
row IN subselect
sql/sql_class.cc:
changed name of class to corerectly reflex its function
sql/sql_class.h:
changed name of class to corerectly reflex its function
sql/sql_yacc.yy:
changed name of class to corerectly reflex its function
include/mysql_com.h:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/set_var.h:
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_show.cc:
Auto merged
libmysqld/libmysqld.c:
e
merging with vva's code.
mysql-test/r/subselect.result:
test of simple row subselect
fixed table droping
mysql-test/t/subselect.test:
test of simple row subselect
fixed table dropimg
sql/item.cc:
Item_cache_str fixed to correctly store NULL and copy string value
sql/item.h:
Item_cache_str fixed to correctly store NULL and copy string value
sql/item_cmpfunc.cc:
support of simple row subselects
sql/item_subselect.cc:
support of simple row subselects
sql/item_subselect.h:
support of simple row subselects
sql/sql_class.cc:
support of simple row subselects
sql/item.h:
optimized single value subselect (to be used as row)
sql/item_subselect.cc:
optimized single value subselect (to be used as row)
sql/item_subselect.h:
optimized single value subselect (to be used as row)
sql/sql_class.cc:
optimized single value subselect (to be used as row)
BitKeeper/etc/logging_ok:
auto-union
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
client/mysql.cc:
#ifdef EMBEDDED_LIBRARY added
client/mysqltest.c:
#ifdef EMBEDDED_LIBRARY added
include/mysql.h:
MYSQL structure changed for embedded case
include/mysql_com.h:
NET structure changed for embedded case
include/violite.h:
no need to special vio types
libmysqld/embedded_priv.h:
superfluous functions removed
libmysqld/lib_sql.cc:
several modifications
libmysqld/lib_vio.c:
file should be removed
libmysqld/libmysqld.c:
several modifications
sql/ha_berkeley.cc:
modification for embedded case
sql/ha_innodb.cc:
modifications for embedded case
sql/ha_myisam.cc:
modifications for embedded case
sql/item_func.cc:
modifications for embedded case
sql/log.cc:
#ifdef-ed parts of file which don't work in embedded case
sql/log_event.cc:
#ifdef-ed parts of file which don't work in embedded case
sql/log_event.h:
#ifdef-ed parts of file which don't work in embedded case
sql/mf_iocache.cc:
file doesn't work in embedded case
sql/mini_client.cc:
file should be removed from embedded library
sql/mysqld.cc:
several modifications
sql/net_pkg.cc:
#ifdef-ed functions which can't work in embedded case
sql/net_serv.cc:
file doesn't work in embedded case
sql/repl_failsafe.cc:
no replication in embedded case
sql/repl_failsafe.h:
no replication in embedded case
sql/set_var.cc:
#ifdef-ed variables which have no sense in embedded library
sql/set_var.h:
#ifdef-ed variables which have no sense in embedded library
sql/slave.cc:
no replication in embedded library
sql/slave.h:
no replication in embedded library
sql/sql_acl.cc:
modifications for embedded case
sql/sql_cache.cc:
modifications for embedded case
sql/sql_class.cc:
modifications for embedded case
sql/sql_class.h:
THD structure modified for embedded case
sql/sql_db.cc:
modification for embedded case
sql/sql_error.cc:
modification for embedded case
sql/sql_help.cc:
modification for embedded case
sql/sql_load.cc:
#ifdef-ed code which doesn't work in embedded case
sql/sql_parse.cc:
#ifdef-ed code which doesn't work in embedded case
sql/sql_prepare.cc:
#ifdef-ed code which doesn't work in embedded case
sql/sql_repl.cc:
no replication in embedded library
sql/sql_repl.h:
no replication in embedded library
sql/sql_select.cc:
query cache don't work now in embedded library
sql/sql_show.cc:
modifications for embedded case
mysql-test/r/derived.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/union.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format.
DATE_ADD() and related functions now returns correct DATE/DATETIME type depending on argument types.
Now all tests passes, still some work left to remove warnings in log files from mysql-test-run
mysql-test/r/cast.result:
New result for time
mysql-test/r/delayed.result:
Timestamp update
mysql-test/r/derived.result:
Fix after bulk insert change
mysql-test/r/explain.result:
Fix after bulk insert change
mysql-test/r/func_date_add.result:
Timestamp change
mysql-test/r/func_str.result:
Timestamp change
mysql-test/r/func_time.result:
Timestamp change
mysql-test/r/innodb.result:
Timestamp change
mysql-test/r/join_outer.result:
Fix after bulk insert change
mysql-test/r/key_primary.result:
Fix after bulk insert change
mysql-test/r/keywords.result:
Timestamp change
mysql-test/r/merge.result:
Removed warning
mysql-test/r/odbc.result:
Fix after bulk insert change
mysql-test/r/range.result:
Fix after bulk insert change
mysql-test/r/select.result:
Fix after bulk insert change
mysql-test/r/subselect.result:
Fixed EXPLAIN output
mysql-test/r/type_datetime.result:
Timestamp update
mysql-test/r/type_ranges.result:
Timestamp update
mysql-test/r/type_timestamp.result:
Timestamp update
mysql-test/r/union.result:
EXPLAIN UPDATE
mysql-test/t/func_str.test:
Timestamp update
mysql-test/t/func_time.test:
New test for interval type result
mysql-test/t/merge.test:
Remove warnings of wrong drop table
mysql-test/t/type_datetime.test:
Timestamp change
mysql-test/t/type_timestamp.test:
Timestamp change
sql/field.cc:
Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format
sql/field.h:
Changed timestamp to return string in YYYY-MM-DD HH:MM:SS format
sql/item.cc:
Binary protocol update
sql/item.h:
Binary protocol update
sql/item_func.cc:
Added comment
sql/item_func.h:
@variables are always returned to the client as strings
sql/item_timefunc.cc:
Changed INTERVAL to return correct type
sql/item_timefunc.h:
Changed INTERVAL to return correct type
sql/mysqld.cc:
Changed default pthread_attr_setstacksize to 129K
sql/protocol.cc:
More type checking
sql/set_var.cc:
Fixed that @convert works ok with new protocol
sql/sql_analyse.cc:
Fixed bug in analyze
sql/sql_class.cc:
Fixed bug from last push in LIMIT
sql/sql_error.cc:
More optimal types
sql/sql_repl.cc:
Binary protocol changes
sql/sql_select.cc:
Fixed bug in multi-table-update
Changed EXPLAIN to return NULL instead of empty strings
sql/sql_show.cc:
Binary protocol
BitKeeper/etc/logging_ok:
auto-union
include/mysql.h:
Auto merged
sql/convert.cc:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
libmysqld/lib_sql.cc:
merging
sql/item_strfunc.cc:
merging
Class for sending data from server to client (Protocol)
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
libmysql/libmysql.c:
Jump over reserved bits in the binary protocol
libmysqld/Makefile.am:
rename of net_pkg.cc to protocol.cc
mysql-test/r/case.result:
Fixed previously wrong test
mysql-test/r/cast.result:
Fixed previously wrong test
sql/Makefile.am:
Rename of net_pkg.cc to protocol.cc
sql/field.cc:
Binary protocol
Added key handling functions for new VARCHAR type
sql/field.h:
New protocol
sql/ha_berkeley.cc:
New protocol
sql/ha_berkeley.h:
New protocol
sql/ha_innodb.cc:
New protocol
sql/ha_myisam.cc:
New protocol
sql/item.cc:
New protocol
sql/item.h:
New protocol
sql/item_func.cc:
Removed old code from 3.23
sql/item_func.h:
Set cached_result_type as it was previosly used before set
sql/item_subselect.cc:
Standard make_field() is now good enough
sql/item_subselect.h:
Use default make_field()
sql/item_sum.cc:
Clean up Item_sum::make_field()
sql/item_sum.h:
Use standard make_field()
sql/item_timefunc.h:
return correct types for casts()
Use standard make_field()
sql/log_event.cc:
New protocol
sql/log_event.h:
New protocol
sql/mysql_priv.h:
Move things to protocol.h
sql/opt_range.cc:
Indentation cleanups + small optimization
sql/procedure.h:
Use MYSQL_TYPE instead of FIELD_TYPE
sql/protocol.cc:
Class for sending data from server to client.
This handles both the old ( <= 4.0 ) protocol and then new binary protocol that is used for prepared statements.
sql/repl_failsafe.cc:
New protocol
sql/slave.cc:
New protocol
sql/sql_acl.cc:
New protocol
sql/sql_base.cc:
Move send_fields() to protocol.cc
sql/sql_class.cc:
New protocol
sql/sql_class.h:
New protocol
sql/sql_db.cc:
New protocol
sql/sql_error.cc:
New protocol
sql/sql_handler.cc:
New protocol
sql/sql_help.cc:
New protocol
sql/sql_parse.cc:
Remove wrong assert (variable was not initalized at this point)
sql/sql_prepare.cc:
New protocol
sql/sql_repl.cc:
New protocol
sql/sql_select.cc:
New protocol
sql/sql_show.cc:
New protocol
sql/sql_string.h:
New functions used by the protocol functions
sql/sql_table.cc:
New protocol
sql/structs.h:
Make second_part ulong to prepare for ANSI sub-seconds
sql/time.cc:
New convert function needed by the new protocol functions
optimization of left expression evaluation
more descriptive method name
mysql-test/r/func_in.result:
test of _NEW_ IN behaviour with NULL
mysql-test/r/subselect.result:
test of _NEW_ IN/ALL/ANY/SOME behaviour with NULL
mysql-test/t/func_in.test:
test of _NEW_ IN behaviour with NULL
mysql-test/t/subselect.test:
test of _NEW_ IN/ALL/ANY/SOME behaviour with NULL
sql/item.cc:
_NEW_ IN/ALL/ANY/SOME behaviour with NULL
optimization of left expression evaluation
sql/item.h:
_NEW_ IN/ALL/ANY/SOME behaviour with NULL
optimization of left expression evaluation
sql/item_cmpfunc.cc:
_NEW_ IN/ALL/ANY/SOME behaviour with NULL
optimization of left expression evaluation
sql/item_cmpfunc.h:
_NEW_ IN/ALL/ANY/SOME behaviour with NULL
optimization of left expression evaluation
sql/item_subselect.cc:
_NEW_ IN/ALL/ANY/SOME behaviour with NULL
optimization of left expression evaluation
sql/item_subselect.h:
_NEW_ IN/ALL/ANY/SOME behaviour with NULL
optimization of left expression evaluation
sql/sql_class.cc:
more descriptive method name
sql/sql_union.cc:
more descriptive method name
BitKeeper/etc/ignore:
auto-union
acinclude.m4:
Auto merged
configure.in:
Auto merged
heap/hp_delete.c:
Auto merged
heap/hp_scan.c:
Auto merged
include/my_base.h:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/mi_rnext_same.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/r/alter_table.result:
Auto merged
mysql-test/r/distinct.result:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/group_by.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/group_by.test:
Auto merged
mysql-test/t/select.test:
Auto merged
mysys/hash.c:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/structs.h:
Auto merged
sql/uniques.cc:
Auto merged
strings/strto.c:
Auto merged
vio/vio.c:
Auto merged
BitKeeper/triggers/post-commit:
Add changeset to commit messages
sql-bench/crash-me.sh:
Use version from 4.0
sql-bench/server-cfg.sh:
Use version from 4.0
Fixed 'not initialized' memory error.
mysql-test/mysql-test-run.sh:
Updates to be able to more easily use --valgrind
mysql-test/r/alter_table.result:
Added missing drop table
mysql-test/t/alter_table.test:
Added missing drop table
sql/field.cc:
Simple optimizations
sql/ha_innodb.cc:
Remove copying of parameters as this leads to memory leaks in MySQL.
Should be instead fixed by, in embedded server, make a temporary copy of
all parameters and free them on server-end
sql/log.cc:
Simple optimization
sql/mysql_priv.h:
Move external reference to struct to include file
sql/mysqld.cc:
Added safety asserts
sql/sql_class.cc:
Fixed non fatal 'not initialized memory reference error' in thread init
sql/sql_udf.cc:
Clear current_thd for global thread
strings/strto.c:
Simple optimization
Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
Fixed reference to uninitalized variable
mysql-test/r/distinct.result:
Updated results for new tests
mysql-test/r/func_math.result:
Fixed test of RND()
mysql-test/r/innodb.result:
Updated results for new tests
mysql-test/r/null.result:
Updated results for new tests
mysql-test/t/distinct.test:
New distinct test
mysql-test/t/func_math.test:
Fixed test of RND()
mysql-test/t/innodb.test:
Test for bugs
mysql-test/t/null.test:
TEst for bugs
sql/field.h:
Change of NULL handling to avoid error messages
sql/field_conv.cc:
Change of NULL handling to avoid error messages
sql/item.cc:
Change of NULL handling to avoid error messages
sql/item.h:
Change of NULL handling to avoid error messages
sql/item_cmpfunc.cc:
Change of NULL handling to avoid error messages
sql/item_func.cc:
Change of NULL handling to avoid error messages
sql/item_func.h:
Cleaned up RND() handling
sql/item_timefunc.cc:
Change of NULL handling to avoid error messages
sql/item_timefunc.h:
Change of NULL handling to avoid error messages
sql/opt_range.cc:
Fixed bug in <=> NULL
sql/password.c:
Indentation cleanup
sql/sql_base.cc:
Change of NULL handling to avoid error messages
sql/sql_class.cc:
Fixed reference to uninitalized variable
sql/sql_handler.cc:
Change of NULL handling to avoid error messages
sql/sql_select.cc:
Change of NULL handling to avoid error messages
Optimized SELECT DISTINCT ... ORDER BY ... LIMIT
sql/sql_select.h:
Change of NULL handling to avoid error messages
sql/unireg.cc:
Change of NULL handling to avoid error messages
(This caused the DISTINCT test to fail)
Removed one inline as this caused compiler problems
heap/hp_create.c:
Comment
heap/hp_update.c:
Indentation cleanup
heap/hp_write.c:
Indentation cleanup
mysql-test/mysql-test-run.sh:
Better options for valgrind
sql/item_sum.cc:
Removed inline as this caused compiler problems with gcc 3.2
(Was also non standard usage of inline)
sql/item_sum.h:
Removed inline as this caused compiler problems with gcc 3.2
sql/sql_class.cc:
Fixed reference to uninitialized value
sql/sql_lex.cc:
Indentation cleanup
sql/sql_select.cc:
Fixed bug when creating keys in temporary HEAP tables.
This is required for prepared statements and stored procedures.
BitKeeper/etc/ignore:
Added bkpull.log bkpull.log.2 bkpull.log.3 build.log sql/safe_to_cache_query.txt to the ignore list
sql/item_create.cc:
Moved safe_to_cache_query from thd to lex.
sql/item_func.cc:
Moved safe_to_cache_query from thd to lex.
sql/sql_cache.cc:
Moved safe_to_cache_query from thd to lex.
Note: Query_cache::is_cacheable() has both a thd and lex argument.
We assumed that it's the lex->safe_to_cache_query we should test.
sql/sql_class.cc:
Moved safe_to_cache_query from thd to lex.
sql/sql_class.h:
Moved safe_to_cache_query from thd to lex.
sql/sql_lex.cc:
Moved safe_to_cache_query from thd to lex.
We set it to 1 initially. It's then set to 0 in cases where
it's know not to be safe. (Before this change, it was set to
0 in thd, and then set to 1 before parsing.)
sql/sql_lex.h:
Moved safe_to_cache_query from thd to lex.
sql/sql_parse.cc:
Moved safe_to_cache_query from thd to lex.
No point in setting it here now, it's set in lex_start() later.
sql/sql_prepare.cc:
Moved safe_to_cache_query from thd to lex.
Must set it after lex_start() has been called.
sql/sql_yacc.yy:
Moved safe_to_cache_query from thd to lex.
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
Auto merged
BitKeeper/etc/config:
Auto merged
acconfig.h:
Auto merged
acinclude.m4:
Auto merged
Docs/manual.texi:
Auto merged
client/mysqlcheck.c:
Auto merged
client/mysqlshow.c:
Auto merged
include/myisam.h:
Auto merged
include/violite.h:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
myisam/Makefile.am:
Auto merged
myisam/ft_nlq_search.c:
Auto merged
myisam/mi_open.c:
Auto merged
myisam/mi_write.c:
Auto merged
myisam/sort.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/isam.result:
Auto merged
mysql-test/r/rpl_replicate_do.result:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/func_test.test:
Auto merged
mysql-test/t/myisam.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/variables.test:
Auto merged
mysys/hash.c:
Auto merged
mysys/tree.c:
Auto merged
scripts/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/filesort.cc:
Auto merged
sql/gen_lex_hash.cc:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/ha_innodb.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/hash_filo.h:
Auto merged
sql/hostname.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/lex.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/mini_client.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_analyse.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_udf.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/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/errmsg.txt:
Auto merged
sql/table.h:
Auto merged
sql/unireg.cc:
Auto merged
sql-bench/server-cfg.sh:
Auto merged
sql/share/norwegian-ny/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/ha_myisam.cc:
Merge with 4.0
Removed some commented code
sql/sql_db.cc:
Merge with 4.0
Optimized the logging of the drop db call a bit
sql/sql_update.cc:
Added comment
New operators MOD and DIV
SELECT ... FROM DUAL
TRUE = 1 and FALSE = 0
include/mysqld_error.h:
New warning message
mysql-test/r/func_system.result:
Added testing of new functions
mysql-test/r/func_test.result:
Added testing of new functions
mysql-test/r/type_blob.result:
Added testing of new functions
mysql-test/t/func_system.test:
Added testing of new functions
mysql-test/t/func_test.test:
Added testing of new functions
mysql-test/t/type_blob.test:
Added testing of new functions
sql/item_func.cc:
Added function DIV
sql/item_func.h:
Added function DIV
sql/lex.h:
New keywords
sql/share/czech/errmsg.txt:
New warning message
sql/share/danish/errmsg.txt:
New warning message
sql/share/dutch/errmsg.txt:
New warning message
sql/share/english/errmsg.txt:
New warning message
sql/share/estonian/errmsg.txt:
New warning message
sql/share/french/errmsg.txt:
New warning message
sql/share/german/errmsg.txt:
New warning message
sql/share/greek/errmsg.txt:
New warning message
sql/share/hungarian/errmsg.txt:
New warning message
sql/share/italian/errmsg.txt:
New warning message
sql/share/japanese/errmsg.txt:
New warning message
sql/share/korean/errmsg.txt:
New warning message
sql/share/norwegian-ny/errmsg.txt:
New warning message
sql/share/norwegian/errmsg.txt:
New warning message
sql/share/polish/errmsg.txt:
New warning message
sql/share/portuguese/errmsg.txt:
New warning message
sql/share/romanian/errmsg.txt:
New warning message
sql/share/russian/errmsg.txt:
New warning message
sql/share/serbian/errmsg.txt:
New warning message
sql/share/slovak/errmsg.txt:
New warning message
sql/share/spanish/errmsg.txt:
New warning message
sql/share/swedish/errmsg.txt:
New warning message
Translated a lot of error messages
sql/share/ukrainian/errmsg.txt:
New warning message
sql/sql_class.cc:
Added support for warnings during parsing
sql/sql_class.h:
Added support for warnings during parsing
sql/sql_error.cc:
Added support for warnings during parsing
sql/sql_lex.cc:
Fixed comment
sql/sql_parse.cc:
Added automatic conversion from CHAR(length) to BLOB when length > 255
Added support for BLOB(length)
sql/sql_yacc.yy:
New operators MOD and DIV
SELECT ... FROM DUAL
TRUE = 1 and FALSE = 0
Add support for LIMIT # OFFSET #
Changed lock handling: Now all locks should be stored in TABLE_LIST instead of passed to functions.
Don't call query_cache_invalidate() twice in some cases
mysql_change_user() now clears states to be equal to close + connect.
Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES
Fixed a bug with replicate-do and UPDATE
BitKeeper/etc/ignore:
added autom4te.cache/* bdb/dist/autom4te.cache/* innobase/autom4te.cache/*
include/my_alloc.h:
Small improvement to alloc_root
libmysql/libmysql.c:
Removed compiler warning
myisam/mi_page.c:
Better DBUG message
mysql-test/r/multi_update.result:
Added test with lock tables
mysql-test/r/rpl_replicate_do.result:
Update results
mysql-test/r/rpl_rotate_logs.result:
Make test independent of if t1 exists
mysql-test/t/multi_update.test:
Added test with lock tables
mysql-test/t/rpl_rotate_logs.test:
Make test independent of if t1 exists
mysys/my_alloc.c:
Small imprevement to alloc_root
(Don't free blocks less than ALLOC_MAX_BLOCK_ROOT (4K)
sql/ha_innodb.cc:
More debug messages
sql/ha_myisam.cc:
Safety change
sql/lex.h:
Add support for LIMIT # OFFSET #
sql/lock.cc:
Added assertion
sql/mysql_priv.h:
Change of lock handling
sql/mysqld.cc:
Added function clear_error_messages()
sql/sql_base.cc:
Change lock handling by open_ltable() and open_and_lock_tables()
sql/sql_class.cc:
Split THD::THD to two functions
Move some code from cleanup() to ~THD:THD
Add THD::change_user()
sql/sql_class.h:
Prototype changes in class THD
sql/sql_delete.cc:
Remove locking argument from mysql_delete()
Locking type is now stored in TABLE_LIST
Small code change to not call query_cache_invalidate() twice for transactional tables.
sql/sql_insert.cc:
Remove locking argument from mysql_insert()
Locking type is now stored in TABLE_LIST
Small code change to not call query_cache_invalidate() twice for transactional tables.
Don't use bulk insert if bulk_insert_buff_size is 0
sql/sql_parse.cc:
Changes to make mysql_change_user() work as close+connect
Changed command statistics to use statstics_increment to get more speed
Update code to handle that locks is now stored in TABLE_LIST
sql/sql_update.cc:
Remove locking argument from mysql_update()
Locking type is now stored in TABLE_LIST
Small code change to not call query_cache_invalidate() twice for transactional tables.
sql/sql_yacc.yy:
Locking type is now stored in TABLE_LIST
Added support for LIMIT # OFFSET # syntax
Removed some wrong (never true) checks for SQLCOM_MULTI_UPDATE
mysql-test/t/rpl_replicate_do-slave.opt:
Changed tables to use t1,t2,...
mysql-test/t/rpl_replicate_do.test:
Changed tables to use t1,t2,...
mysql-test/r/subselect.result:
test of cyclic reference
mysql-test/t/subselect.test:
test of cyclic reference
sql/sql_parse.cc:
fixed layout
fixed bug in cyclic reference refinition
fixed bug in error handling
mysql-test/r/subselect.result:
test of error handling
test of derived tables inside subselect
mysql-test/t/subselect.test:
test of error handling
test of derived tables inside subselect
sql/sql_class.cc:
fixed error handling error
sql/sql_lex.h:
fifex layout
sql/sql_parse.cc:
fixed processing of derived tables
sql/sql_select.cc:
more quick abort on error
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-skipkeys~207548ca813d5081:
'Auto converge rename'
libmysqld/lib_sql.cc:
Auto merged
sql/field.h:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_handler.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
client/mysqlbinlog.cc:
Portability fix
configure.in:
Added use of ASFLAGS (For Solaris with Forte 5.0)
include/my_global.h:
Portability fix
include/myisam.h:
Portability fix
include/queues.h:
Portability fix
innobase/include/ut0ut.h:
Portability fix
innobase/log/log0log.c:
Portability fix
innobase/rem/rem0cmp.c:
Portability fix
innobase/trx/trx0sys.c:
Portability fix
isam/pack_isam.c:
Portability fix
myisam/ft_boolean_search.c:
Portability fix
myisam/mi_dynrec.c:
Code change to go around bug in Forte 5.0
myisam/sort.c:
Portability fix
mysys/my_aes.c:
Portability fix
scripts/Makefile.am:
Support for ASFLAGS
scripts/mysqlbug.sh:
Support for ASFLAGS
sql/field.cc:
Portability fix
sql/filesort.cc:
Portability fix
sql/gen_lex_hash.cc:
Portability fix
sql/ha_innodb.cc:
Portability fix
Changed SHOW INNODB STATUS to return error instead of writing message to log file.
sql/ha_isammrg.cc:
Portability fix
sql/ha_myisam.cc:
Portability fix
sql/ha_myisammrg.cc:
Portability fix
sql/hash_filo.h:
Portability fix
sql/hostname.cc:
Portability fix
sql/item_cmpfunc.h:
Indentation change
sql/item_func.cc:
Portability fix
sql/item_func.h:
Portability fix
sql/log.cc:
Portability fix
sql/log_event.cc:
Portability fix
sql/mysql_priv.h:
Portability fix
sql/mysqld.cc:
Portability fix
Fixed bug with rpl_recovery_rank command line option on 64 bit systems
sql/opt_range.cc:
Portability fix
sql/repl_failsafe.cc:
Portability fix
sql/slave.cc:
Portability fix
sql/slave.h:
Portability fix
sql/sql_acl.cc:
Portability fix
sql/sql_base.cc:
Portability fix
sql/sql_cache.cc:
Portability fix
sql/sql_cache.h:
Portability fix
sql/sql_class.cc:
Portability fix
sql/sql_delete.cc:
Portability fix
sql/sql_insert.cc:
Portability fix
sql/sql_manager.cc:
Portability fix
sql/sql_parse.cc:
Portability fix
BUILD/compile-solaris-sparc-forte:
C
sql/sql_udf.cc:
Portability fix
sql/sql_update.cc:
Portability fix
strings/Makefile.am:
Portability fix
strings/bmove_upp-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/str_test.c:
Cleanup
strings/strappend-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/strend-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/strmake-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/strmov-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/strnmov-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/strstr-sparc.s:
Fix so that this works on 32 and 64 bit sparcs
strings/strxmov-sparc.s:
Fixes to make this more portable, but it's still not usable on 64 bit systems :(
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
