sql/protocol.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/set_var.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/create.result:
Auto merged
mysql-test/t/create.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
include/mysqld_error.h:
Merge for updates
mysql-test/r/rpl_change_master.result:
Merge for updates
sql/share/czech/errmsg.txt:
Merge for updates
sql/share/danish/errmsg.txt:
Merge for updates
sql/share/dutch/errmsg.txt:
Merge for updates
sql/share/english/errmsg.txt:
Merge for updates
sql/share/estonian/errmsg.txt:
Merge for updates
sql/share/french/errmsg.txt:
Merge for updates
sql/share/german/errmsg.txt:
Merge for updates
sql/share/greek/errmsg.txt:
Merge for updates
sql/share/hungarian/errmsg.txt:
Merge for updates
sql/share/italian/errmsg.txt:
Merge for updates
sql/share/japanese/errmsg.txt:
Merge for updates
sql/share/korean/errmsg.txt:
Merge for updates
sql/share/norwegian-ny/errmsg.txt:
Merge for updates
sql/share/norwegian/errmsg.txt:
Merge for updates
sql/share/polish/errmsg.txt:
Merge for updates
sql/share/portuguese/errmsg.txt:
Merge for updates
sql/share/romanian/errmsg.txt:
Merge for updates
sql/share/russian/errmsg.txt:
Merge for updates
sql/share/serbian/errmsg.txt:
Merge for updates
sql/share/slovak/errmsg.txt:
Merge for updates
sql/share/spanish/errmsg.txt:
Merge for updates
sql/share/swedish/errmsg.txt:
Merge for updates
sql/share/ukrainian/errmsg.txt:
Merge for updates
include/mysqld_error.h:
New error message: unknown table engine
mysql-test/r/create.result:
New error message: unknown table engine
mysql-test/t/create.test:
New error message: unknown table engine
sql/lex.h:
Remove some keywords: HEAP, ISAM, MERGE, MEMORY, MRG_MYISAM, MYISAM
sql/mysql_priv.h:
Remove unused symbol
sql/set_var.h:
New system variable type: sys_var_thd_table_type
sql/sql_yacc.yy:
Remove tokens and make table_types resolve at run time
sql/sql_show.cc:
Tidy up
sql/sql_table.cc:
Tidy up
include/sql_state.h:
Fix indent
sql/mysqld.cc:
optimize
mysql-test/r/rpl_change_master.result:
It wouldn't pass the tests
mysql-test/r/variables.result:
Fix for changes
mysql-test/r/warnings.result:
Fix for changes
mysql-test/t/variables.test:
Fix for changes
sql/handler.h:
parameter is a const
sql/set_var.cc:
Code clean up for sys_var_thd_table_type::check()
sql/handler.cc:
More tidyup
sql/share/czech/errmsg.txt:
Fixups during review
sql/share/danish/errmsg.txt:
Fixups during review
sql/share/dutch/errmsg.txt:
Fixups during review
sql/share/english/errmsg.txt:
Fixups during review
sql/share/estonian/errmsg.txt:
Fixups during review
sql/share/french/errmsg.txt:
Fixups during review
sql/share/german/errmsg.txt:
Fixups during review
sql/share/greek/errmsg.txt:
Fixups during review
sql/share/hungarian/errmsg.txt:
Fixups during review
sql/share/italian/errmsg.txt:
Fixups during review
sql/share/japanese/errmsg.txt:
Fixups during review
sql/share/korean/errmsg.txt:
Fixups during review
sql/share/norwegian-ny/errmsg.txt:
Fixups during review
sql/share/norwegian/errmsg.txt:
Fixups during review
sql/share/polish/errmsg.txt:
Fixups during review
sql/share/portuguese/errmsg.txt:
Fixups during review
sql/share/romanian/errmsg.txt:
Fixups during review
sql/share/russian/errmsg.txt:
Fixups during review
sql/share/serbian/errmsg.txt:
Fixups during review
sql/share/slovak/errmsg.txt:
Fixups during review
sql/share/spanish/errmsg.txt:
Fixups during review
sql/share/swedish/errmsg.txt:
Fixups during review
sql/share/ukrainian/errmsg.txt:
Fixups during review
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Second edition: error message was deleted as Segey suggested
Now name of the constraint will be used as the name of the key
if the last not specified
mysql-test/r/constraints.result:
appropriate test result
mysql-test/t/constraints.test:
test case for 1189
sql/sql_yacc.yy:
language definitions changed so that we can obtaint constraint's name
and send it as the name of the key if it's not specified
Fixed inconsistency of values of used_tables_cache and
const_item_cache for Item_func_isnull objects (bug #1990).
sql/item_cmpfunc.h:
Fixed inconsistency of values of used_tables_cache and
const_item_cache for Item_func_isnull objects (bug #1990).
mysql-test/t/null.test:
Fixed inconsistency of values of used_tables_cache and
const_item_cache for Item_func_isnull objects (bug #1990).
mysql-test/r/null.result:
Fixed inconsistency of values of used_tables_cache and
const_item_cache for Item_func_isnull objects (bug #1990).
mysql-test/r/join_outer.result:
Fixed inconsistency of values of used_tables_cache and
const_item_cache for Item_func_isnull objects (bug #1990).
Added --protocol to mysqlbinlog
client/mysql.cc:
Indentation cleanup
client/mysqlbinlog.cc:
Added protocol option
mysql-test/r/rpl_until.result:
Update results
mysql-test/t/rpl_until.test:
If --sleep option was given then the salve could do many retries, which affected the size of the binary log. This is fixed by not comparing the binary log size/position
sql/mysqld.cc:
More debugging with set_maximum_open_files()
vio/viosocket.c:
Portability fix.
mysql-test/r/subselect.result:
independent subquery with union
mysql-test/r/union.result:
converting temporary table from HEAP to MyISAM
mysql-test/t/subselect.test:
independent subquery with union
mysql-test/t/union.test:
converting temporary table from HEAP to MyISAM
It was a forgotten ltime->neg=0 (neg was the only forgotten variable).
I scanned field.cc for other places where we would forget to set neg, found none.
A test for the bug.
mysql-test/r/date_formats.result:
result update
mysql-test/t/date_formats.test:
a test for BUG#1960 "date_format() returns spurious '-' for valid dates"
sql/field.cc:
When preparing ltime from the 3-byte date, don't forget to set ltime->neg to 0
(otherwise it remains unitialized).
Dates are not allowed to be negative (only times can be, when they mean a time interval),
so it's ok to always set neg to 0.
temporary table BLOB now is longblob
mysql-test/r/create.result:
blob size changed for safety
mysql-test/r/type_blob.result:
blob size changed for safety
mysql-test/r/type_ranges.result:
blob size changed for safety
mysql-test/r/union.result:
blob size changed for safety
new tests of UNION types merging
mysql-test/t/union.test:
new tests of UNION types merging
sql/field.h:
blob size changed for safety
sql/item.cc:
processing of collation added
added comment
sql/item.h:
joining of UNION fields may failed now, because of incompatibility of collations
sql/sql_union.cc:
joining of UNION fields may failed now, because of incompatibility of collations
mysql-test/r/union.result:
new tests, more correct results for old one
mysql-test/t/union.test:
new tests, more correct results for old one
sql/field.cc:
new way to make field types csting
sql/field.h:
new way to make field types csting
sql/item.cc:
new way to make field types csting
sql/sql_derived.cc:
fixed typo
sql/sql_lex.h:
comment added
Now the I/O thread (in flush_master_info()) flushes the relay log to disk
after reading every event. Slower but provides additionnal safety in case
of brutal crash.
I had to make the flush optional (i.e. add a if(some_bool_argument) in the function)
because sometimes flush_master_info() is called when there is no usable
relay log (the relay log's IO_CACHE is not initialized so can't be flushed).
mysql-test/r/rpl_loaddata_rule_m.result:
avoid a harmless error in the .err file; we don't need a slave in this test
(even though it's called 'rpl' because it's testing binlog-ignore-db).
mysql-test/t/rpl_loaddata_rule_m.test:
result update
sql/repl_failsafe.cc:
update call to flush_master_info() according to new prototype.
sql/slave.cc:
- Now the I/O thread (in flush_master_info()) flushes the relay log to disk
after reading every event. Slower but provides additionnal safety in case
of brutal crash.
I had to make the flush optional (i.e. add a if(some_bool_argument) in the function)
because sometimes flush_master_info() is called when there is no usable
relay log (the relay log's IO_CACHE is not initialized so can't be flushed).
- Update version in message.
- Remove warning about bug as it's not true anymore (since this changeset).
sql/slave.h:
new prototype
sql/sql_repl.cc:
update call to flush_master_info() according to new prototype.
mysql-test/r/union.result:
new results with max union field length detecting
type conversion tests
mysql-test/t/union.test:
type conversion tests
sql/field.h:
field converion support
sql/item.cc:
fixed printing field of internal temporary table of SELECT (reference from HAVING clause)
layout fix
new item for storing field type
sql/item.h:
new item for storing field type
sql/item_subselect.cc:
new subquery item length/dec detecting
sql/mysql_priv.h:
we do not need pre-inited tables and fields
sql/sql_base.cc:
we do not need double fix_fielding
sql/sql_class.h:
we do not need double fix_fielding
sql/sql_derived.cc:
preparing moved before temporary table creation
sql/sql_lex.h:
we do not need pre-inited tables and fields
new lists to store fields types and fields of temporary table
sql/sql_parse.cc:
we do not need pre-inited tables and fields
sql/sql_prepare.cc:
we do not need pre-inited tables and fields
sql/sql_select.cc:
we do not need pre-inited tables and fields
support mysql_select call from derived tables after it preparing (in derived table routing)
support of crreating temporary table fields from Item_type_holder
sql/sql_select.h:
we do not need pre-inited tables and fields
sql/sql_union.cc:
we do not need pre-inited tables and fields
check of columns number in union moved to prepare()
prepering of SELECTS moved before temporary table creation, fixed union columns type/length detecting
sql/sql_update.cc:
we do not need pre-inited tables and fields
Updated project files for windows
Made rpl_change_master.test portable
Ensure that mutex are not freed if not initilized
VC++Files/client/mysql.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/comp_err/comp_err.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/innobase/innobase.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/libmysqld/libmysqld.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/myisamchk/myisamchk.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/myisamlog/myisamlog.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/myisampack/myisampack.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/mysqlmanager/MySqlManager.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/mysqlshutdown/mysqlshutdown.dsp:
Updated project files for windows according to suggestions from Intel
VC++Files/mysys/mysys.dsp:
Updated project files for windows according to suggestions from Intel
libmysql/libmysql.c:
Removed not used include files (which caused problems on Win64)
mysql-test/r/rpl_change_master.result:
Made test portable
mysql-test/t/rpl_change_master.test:
Made test portable
sql-common/client.c:
Removed not used include files (which caused problems on Win64)
sql/ha_innodb.cc:
Ensure that mutex is not freed if not initilized
sql/hostname.cc:
Ensure that mutex is not freed if not initilized
sql/slave.cc:
Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file.
Fixed tests for RAID tables
Detect uninitialized mutexes on lock and destroy
mysql-test/r/raid.result:
Updated results
mysql-test/r/rpl_change_master.result:
Update results missing from last patch
mysql-test/t/raid.test:
Clean up test
mysys/mf_iocache.c:
Comments
Small safety fix
mysys/thr_mutex.c:
Detect uninitialized mutexes on lock and destroy
sql/sql_db.cc:
Fixed memory leak with RAID tables
into deer.(none):/home/hf/work/mysql-4.1.1727
mysql-test/r/derived.result:
Auto merged
mysql-test/t/derived.test:
Auto merged
sql/sql_lex.cc:
Auto merged
Portability fixes
After merge fixes
VC++Files/mysql.dsw:
Added dependencys
VC++Files/mysys/mysys.dsp:
Add missing files
client/mysqlcheck.c:
Added comment
client/mysqltest.c:
Remove not used variables
include/keycache.h:
Removed not used element
include/m_ctype.h:
Portability fix
include/my_base.h:
Removed not used define
myisam/mi_keycache.c:
Added mutex for extra safety
mysql-test/r/count_distinct3.result:
Faster test
mysql-test/r/rpl_change_master.result:
updated results
mysql-test/t/count_distinct3.test:
Faster test
mysql-test/t/rpl_change_master.test:
Make test repeatable
mysys/default.c:
Remove compiler warning
mysys/mf_keycache.c:
Removed not used 'action' element
mysys/my_getopt.c:
Remove not used variable
sql/ha_myisam.cc:
Remove compiler warning
sql/item.cc:
Fixed wrong patch from last changeset
sql/item_timefunc.cc:
Remove compiler warnings
sql/set_var.cc:
Remove compiler warnings
sql/sql_prepare.cc:
Remove not used variables
sql/sql_repl.cc:
After merge fix
sql/sql_select.h:
Added comments
sql/sql_table.cc:
Remove not used define
strings/ctype-tis620.c:
Remove not used variables
The right way to fix this is to change the Field::store(longlong) method to be
Field::store(longlong, bool unsigned_flag), but this is better to do in 4.1 than in 4.0
mysql-test/r/bigint.result:
New tests to show how the last bigint patch broke MySQL
mysql-test/t/bigint.test:
New tests to show how the last bigint patch broke MySQL
sql/item.cc:
Revert patch for bigint handling in double context as it broke normal bigint handling
sql/item.h:
Revert patch for bigint handling in double context as it broke normal bigint handling
Fix for storing negative values in decimal fields
Fix for FLUSH TABLE with HANDLER
BitKeeper/etc/ignore:
auto-union
libmysql_r/Makefile.am:
Auto merged
myisam/mi_check.c:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/bigint.test:
Auto merged
mysql-test/t/user_var.test:
Auto merged
mysql-test/r/rpl_loaddata.result:
Merge with 4.0
sql/item.cc:
Merge with 4.0 to get fix for storing negative values in decimal fields
sql/item.h:
Merge with 4.0 to get fix for storing negative values in decimal fields
sql/sql_handler.cc:
Merge with 4.0 to get fix for FLUSH TABLE with HANDLER
sql/sql_repl.cc:
Merge with 4.0
sql/sql_select.cc:
Used original file.
(Comments moved to sql/sql_select.h)
Fixed compiler warnings (IRIX C compiler and VC++)
VC++Files/client/mysqlclient.dsp:
Add missing file to project
VC++Files/libmysql/libmysql.dsp:
Add missing file to project
VC++Files/myisam/myisam.dsp:
Add missing file to project
VC++Files/mysys/mysys.dsp:
Add missing file to project
heap/hp_test1.c:
Fixed wrong call to heap_rkey()
heap/hp_test2.c:
Fixed wrong call to heap_rkey()
include/hash.h:
Move not used (internal) struct to hash.c
include/my_pthread.h:
Made some structs 'const char*' to avoid warnings
include/my_sys.h:
Moved key cache structs and functions to keycache.h
include/myisam.h:
Merge key cache structures to one
include/mysql.h:
Remove STDCALL from internal functions
include/sql_common.h:
Remove STDCALL from internal functions
include/violite.h:
Fixed compiler warning
isam/_locking.c:
Merge key cache structures to one
isam/_page.c:
Merge key cache structures to one
isam/close.c:
Merge key cache structures to one
isam/extra.c:
Merge key cache structures to one
isam/isamchk.c:
Merge key cache structures to one
isam/isamdef.h:
Merge key cache structures to one
isam/isamlog.c:
Merge key cache structures to one
isam/panic.c:
Merge key cache structures to one
isam/test2.c:
Merge key cache structures to one
isam/test3.c:
Merge key cache structures to one
libmysql/client_settings.h:
Remove STDCALL from internal functions
libmysql/libmysql.c:
Remove STDCALL from internal functions
myisam/ft_boolean_search.c:
Fixed compiler warning
myisam/ft_dump.c:
Fixed compiler warnings (%qx is not portable)
myisam/ft_update.c:
Fixed compiler warnings
myisam/mi_check.c:
Merge key cache structures to one
myisam/mi_close.c:
Merge key cache structures to one
myisam/mi_delete_all.c:
Merge key cache structures to one
myisam/mi_extra.c:
Merge key cache structures to one
myisam/mi_keycache.c:
Merge key cache structures to one
myisam/mi_locking.c:
Merge key cache structures to one
myisam/mi_page.c:
Merge key cache structures to one
myisam/mi_panic.c:
Merge key cache structures to one
myisam/mi_preload.c:
Merge key cache structures to one
myisam/mi_test1.c:
Merge key cache structures to one
myisam/mi_test2.c:
Merge key cache structures to one
myisam/mi_test3.c:
Merge key cache structures to one
myisam/myisamchk.c:
Merge key cache structures to one
myisam/myisamdef.h:
Merge key cache structures to one
myisam/myisamlog.c:
Merge key cache structures to one
Removed not used option
myisam/sort.c:
Fixed compiler warnings
myisam/sp_test.c:
Fixed compiler warnings
mysql-test/r/case.result:
Updated results after fix of correct NULL detection in WHEN
mysql-test/r/date_formats.result:
Updated results after fixing date handling
mysql-test/r/symlink.result:
Updated results after adding DEFAULT CHARSET
mysql-test/t/case.test:
New test
mysql-test/t/symlink.test:
Updated error numbers
mysys/hash.c:
Made HASH_LINK struct local
mysys/mf_keycache.c:
Merge key cache structures to one
Fixed key_cache_read() and key_cache_write() to be resize-safe.
mysys/mf_keycaches.c:
Merge key cache structures to one
mysys/thr_mutex.c:
Added test if mutex is initalized
sql-common/client.c:
Remove STDCALL from internal functions
sql/derror.cc:
Added comment
sql/field.cc:
Removed not used variables
sql/ha_innodb.cc:
Fixed compiler warnings (removed not used variables)
sql/ha_myisam.cc:
Merge key cache structures to one
sql/ha_myisammrg.cc:
Removed not used variables
sql/handler.cc:
Merge key cache structures to one
sql/handler.h:
Merge key cache structures to one
sql/item.cc:
Fixed compiler warning
sql/item_cmpfunc.cc:
Remove not used variables
sql/item_func.cc:
Remove not used variables
sql/item_strfunc.cc:
Removed not used variables
sql/item_sum.cc:
Removed not used variables
Moved setting of item_thd to fix_fields()
sql/item_timefunc.cc:
Removed not used variables
sql/mysql_priv.h:
Merge key cache structures to one
sql/mysqld.cc:
Merge key cache structures to one
init_thread_environment() is not called before mysql_init_variables(). This fixes a case where a mutex was not initialized before it was used
sql/opt_sum.cc:
Remove not used variables
sql/protocol.cc:
Don't send errors after ok has been sent
sql/protocol_cursor.cc:
Remove not used variable
Simple optimization
sql/repl_failsafe.cc:
Remove not used variables
sql/set_var.cc:
Merge key cache structures to one
sql/set_var.h:
Merge key cache structures to one
sql/sql_acl.cc:
Remove not used variables
sql/sql_base.cc:
Remove not used function
sql/sql_db.cc:
Remove not used variables
sql/sql_handler.cc:
Remove not used variables
sql/sql_insert.cc:
More DBUG statements
Simple code cleanup
sql/sql_lex.cc:
Remove not used variables
sql/sql_parse.cc:
Remove not used variables
sql/sql_prepare.cc:
Remove not used variables
sql/sql_repl.cc:
Remove not used variables
sql/sql_select.cc:
Remove not used variables
sql/sql_show.cc:
Remove not used variables
sql/sql_table.cc:
Merge key cache structures to one
Removed not used variables
sql/sql_test.cc:
Merge key cache structures to one
sql/strfunc.cc:
Fixed that find_type() returns correct value for partly matched words.
(This fixed the error found by date_formats.test)
sql/time.cc:
Remove not used variables
strings/my_strtoll10.c:
Fixed compiler warnings
(Initial caps for each word.) For example, instead of writing
Until_condition, Until_Log_File, and Until_log_pos, write
Until_Condition, Until_Log_File, and Until_Log_pos.
mysql-test/r/rpl000015.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_empty_master_crash.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_error_ignored_table.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_flush_log_loop.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_loaddata.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_log.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_log_pos.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_max_relay_size.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_openssl.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_redirect.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_replicate_do.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_reset_slave.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_rotate_logs.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_trunc_binlog.result:
Write slave status field names using consistent style.
mysql-test/r/rpl_until.result:
Write slave status field names using consistent style.
mysql-test/t/mix_innodb_myisam_binlog.test:
Write slave status field names using consistent style.
mysql-test/t/rpl_max_relay_size.test:
Write slave status field names using consistent style.
sql/slave.cc:
Write slave status field names using consistent style.
more user variable tests
mysql-test/r/user_var.result:
more user variable tests (just to have this behaviour written down somewhere)
mysql-test/t/user_var.test:
more user variable tests (just to have this behaviour written down somewhere)
sql/sql_handler.cc:
Bug#1826, HANDLER+ALTER TABLE=crash
(unfortunately, it cannot be tested in mysql-test suite)
"CHANGE MASTER makes SQL thread restart from coordinates of I/O thread".
So, in CHANGE MASTER:
when it seems reasonable that the user did not want to discontinue
its replication (i.e. when he is not specifying host or port or master_log_file
or master_log_pos; this will be documented), set the coordinates of the
I/O thread to those of the SQL thread. This way, the SQL thread will see
no discontinuity in the relay log (i.e. will skip no events), because
the I/O thread will fill the brand new relay log with the events which
are just after the position where the SQL thread had stopped
(before CHANGE MASTER was issued).
And a new test for this bug.
mysql-test/r/rpl_loaddata.result:
Now, after CHANGE MASTER the coordinates of the I/O thread are the last ones of the SQL thread, so result update.
sql/sql_repl.cc:
Fix for BUG#1870
"CHANGE MASTER makes SQL thread restart from coordinates of I/O thread".
So, in CHANGE MASTER:
when it seems reasonable that the user did not want to discontinue
its replication (i.e. when he is not specifying host or port or master_log_file
or master_log_pos; this will be documented), set the coordinates of the
I/O thread to those of the SQL thread. This way, the SQL thread will see
no discontinuity in the relay log (i.e. will skip no events), because
the I/O thread will fill the brand new relay log with the events which
are just after the position where the SQL thread had stopped
(before CHANGE MASTER was issued).
into sanja.is.com.ua:/home/bell/mysql/bk/work-delete-4.1
mysql-test/r/subselect.result:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
