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
reordered Item_row class variables to be sorted by memory size
mysql-test/r/subselect.result:
fix result of subselect test
sql/item.cc:
postreviews fix
sql/item.h:
postreviews fix
sql/item_cmpfunc.h:
postreviews fix
sql/item_row.cc:
postreviews fix
sql/item_row.h:
reordered class variables to be sorted by memory size
postreviews fix
sql/item_strfunc.cc:
postreviews fix
sql/item_subselect.cc:
postreviews fix
Changed long packat handling to check for packets of length 0xffffff.
This does however break packet handling for older clients.
If you are using packets >= 16M then you need to upgrade client and server
after this patch.
Docs/internals.texi:
Updated documentation for 4.1 protocol
sql/ha_innodb.cc:
Optimization of checking command
sql/item.h:
Removed automatic set of length for Item_string
sql/item_create.cc:
Optimized create of create_func_current_user()
sql/net_serv.cc:
Fixed wrong max packet length
sql/sql_acl.cc:
Safety fix.
sql/sql_parse.cc:
Cut hostnames at HOSTNAME_LENGTH to avoid theoretical hostname overruns
Changed long packat handling to check for packets of length 0xffffff.
This does however break packet handling for older clients.
If you are using packets >= 16M then you need to upgrade client and server
after this patch.
fixed bug of calling setup_fields without correct lex->current_select pointer in mysql_derived
more correct creation of reference in Item_field::fix_field
mysql-test/r/subselect.result:
new explain with subselect reduced
mysql-test/t/subselect.test:
new explain with subselect reduced
sql/item.cc:
support of subselect without FROM reducing
more correct creation of reference in Item_field::fix_field
sql/item.h:
support of subselect without FROM reducing
sql/item_cmpfunc.cc:
support of subselect without FROM reducing
sql/item_cmpfunc.h:
support of subselect without FROM reducing
sql/item_func.cc:
support of subselect without FROM reducing
sql/item_func.h:
support of subselect without FROM reducing
sql/item_row.cc:
support of subselect without FROM reducing
sql/item_row.h:
support of subselect without FROM reducing
sql/item_strfunc.h:
fixed layout
support of subselect without FROM reducing
sql/item_subselect.cc:
support of subselect without FROM reducing
sql/item_subselect.h:
support of subselect without FROM reducing
sql/mysql_priv.h:
reference in Item_field::fix_field related changes
sql/sql_base.cc:
reference in Item_field::fix_field related changes
sql/sql_derived.cc:
fixed bug of calling setup_fields without correct lex->current_select pointer
fixed bug of calling setup_fields without correct lex->current_select pointer in mysql_derived
more correct creation of reference in Item_field::fix_field
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
removed unused items
sql/item.cc:
removed unused Items
sql/item.h:
removed unused Items
sql/item_cmpfunc.cc:
Item_in_optimizer is changed to be used with row IN subselect
sql/item_cmpfunc.h:
Item_in_optimizer is changed to be used with row IN subselect
sql/item_subselect.cc:
Item_in_optimizer is changed to be used with row IN subselect
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
fixed method definition (overloading instead of redefinition)
fixed time expression type definition
mysql-test/r/subselect.result:
test of subselect null test
mysql-test/t/subselect.test:
test of subselect null test
sql/item.h:
fixed method definition (overloading instead of redefinition)
sql/item_subselect.h:
fixed subselect null test
sql/item_timefunc.cc:
fixed time expression type definition
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
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
into eagle.mysql.r18.ru:/home/vva/work/VARIANCE/4.1.clone
BitKeeper/etc/logging_ok:
auto-union
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Fixed eval bug; now conditions with local variables work in WHILE et al.
Made mysql_install_db.sh create proc table.
scripts/mysql_install_db.sh:
Added creation of the mysql.proc table.
Note: The table format will change later, right now it's rather minimalistic,
just so things can be tested (and the database can easily be recreated when
I break it :-/ ).
sql/item.h:
Removed unused method.
sql/sp_head.cc:
Added collection of called procedures in a list.
Fixed eval bug; now conditions with local variables work in WHILE et al.
