into sanja.is.com.ua:/home/bell/mysql/bk/work-drop-4.1
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/sql_db.cc:
Auto merged
mysql-test/t/mysqldump.test:
Fixing a test to encompass latest Jani's patch to mysqldump.c
sql/sql_union.cc:
Fix for the unlock problem with a typo correction.
(This might not be enough, could be more statements that must be detected...)
mysql-test/r/sp.result:
Test case for BUG#2267
mysql-test/t/sp.test:
Test case for BUG#2267
sql/sp.cc:
Code clean-up: Get the correct order of print-outs in debug trace.
sql/sql_yacc.yy:
Detect "select-like" statements so that the multi result flag is set correctly.
moved LIMIT initialialization, because it is need only for single select derived table
mysql-test/r/derived.result:
test suite for BUG#2349
mysql-test/t/derived.test:
test suite for BUG#2349
sql/sql_derived.cc:
assigned correct lex->current_select (BUG#2349)
moved LIMIT initialialization, because it is need only for single select
Found a few more places in the parser (insert, replace and update) where
local stored procedure variables should not be recognized.
mysql-test/r/sp-error.result:
Test cases for BUG#2329
mysql-test/r/sp.result:
New test case for certain context dependencies for symbols.
mysql-test/t/sp-error.test:
Test cases for BUG#2329
mysql-test/t/sp.test:
New test case for certain context dependencies for symbols.
sql/sql_yacc.yy:
Found a few more places where local SP variables should not be recognized.
by fixing optimizer bug with help of 'volatile' keyword
mysql-test/r/func_math.result:
added tests for BUG #2338 Trigonometric arithmetic problems
mysql-test/t/func_math.test:
added tests for BUG #2338 Trigonometric arithmetic problems
sql/item_func.cc:
added keyword volatile in Item_func_acos::val and Item_func_asin::val
to calm optimizer down and to avoid it's bug
A fix for a bug #3189, pertaining to crashing MySQL server when a query with MIN / MAX on the BLOB column is to be optimised
sql/opt_sum.cc:
A fix for a bug #3189, pertaining to crashing MySQL server when a query with MIN / MAX on the BLOB column is to be optimised
This way, a crash of mysqltest will be visible in the test logs
(output of mysql-test-run).
mysql-test/mysql-test-run.sh:
by design mysqltest returns 0 or 1 or 2 (see the exit()s and the return()
of main()). So any greater code is a crash, I guess.
On build and on my machine, 139 is segfault and 134 is assertion failure.
The test might fail if one runs it at 23:59:59 Dec 31
mysql-test/r/type_year.result:
a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
mysql-test/t/type_year.test:
a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
sql/field.h:
a fix (bug #2335: Inconsistancy with handling of Years and NOW() function)
Fix for a bug #2219, regarding a bad cast to integer from NULL
item_func.h:
Fix for a bug #2219, regarding a bad cast to integer from NULL
sql_parse.cc:
A fix for a bug #2207, with mysql server haning on option setting
sql/sql_parse.cc:
A fix for a bug #2207, with mysql server haning on option setting
sql/item_func.h:
Fix for a bug #2219, regarding a bad cast to integer from NULL
mysql-test/t/null.test:
Fix for a bug #2219, regarding a bad cast to integer from NULL
mysql-test/r/null.result:
Fix for a bug #2219, regarding a bad cast to integer from NULL
mysql-test/r/sp.result:
Test case for BUG#2260.
mysql-test/t/sp.test:
Test case for BUG#2260.
sql/sp_rcontext.cc:
Detect warning and not found, and exception condition correctly.
Initialize and test properly when cleaning up, to avoid crash in some error cases.
mysql-test/r/sp-error.result:
Test case for BUG#2259
mysql-test/t/sp-error.test:
Test case for BUG#2259
sql/sp_rcontext.cc:
Cleanup in a more controlled way to avoid crashes in some error cases.
Remove unused variable.
sql/sp_rcontext.h:
Initialize member var, for cleanup tests.
Parse column names (and not variables) only in UPDATE ... SET ...
mysql-test/r/sp-error.result:
New test case for BUG#2272
mysql-test/t/sp-error.test:
New test case for BUG#2272
sql/sql_yacc.yy:
"UPDATE table SET id = val" should only recognize column names, and not
local SP variables for 'id'.
(Also removed "as locator" syntax which is not supported.)
allow delete table by alias in multi-delete statement
include/mysqld_error.h:
new error message about non-updateable table
mysql-test/r/derived.result:
test of multi-update and multi-delete
mysql-test/t/derived.test:
test of multi-update and multi-delete
sql/share/czech/errmsg.txt:
new error message about non-updateable table
sql/share/danish/errmsg.txt:
new error message about non-updateable table
sql/share/dutch/errmsg.txt:
new error message about non-updateable table
sql/share/english/errmsg.txt:
new error message about non-updateable table
sql/share/estonian/errmsg.txt:
new error message about non-updateable table
sql/share/french/errmsg.txt:
new error message about non-updateable table
sql/share/german/errmsg.txt:
new error message about non-updateable table
sql/share/greek/errmsg.txt:
new error message about non-updateable table
sql/share/hungarian/errmsg.txt:
new error message about non-updateable table
sql/share/italian/errmsg.txt:
new error message about non-updateable table
sql/share/japanese/errmsg.txt:
new error message about non-updateable table
sql/share/korean/errmsg.txt:
new error message about non-updateable table
sql/share/norwegian-ny/errmsg.txt:
new error message about non-updateable table
sql/share/norwegian/errmsg.txt:
new error message about non-updateable table
sql/share/polish/errmsg.txt:
new error message about non-updateable table
sql/share/portuguese/errmsg.txt:
new error message about non-updateable table
sql/share/romanian/errmsg.txt:
new error message about non-updateable table
sql/share/russian/errmsg.txt:
new error message about non-updateable table
sql/share/serbian/errmsg.txt:
new error message about non-updateable table
sql/share/slovak/errmsg.txt:
new error message about non-updateable table
sql/share/spanish/errmsg.txt:
new error message about non-updateable table
sql/share/swedish/errmsg.txt:
new error message about non-updateable table
sql/share/ukrainian/errmsg.txt:
new error message about non-updateable table
sql/sql_parse.cc:
allow delete table by alias
separate error message for try to delete derived table
sql/sql_update.cc:
test "is updated table derived?"
sql/sql_yacc.yy:
error message in case of try to update derived table
(BUG#2089)
mysql-test/r/subselect_innodb.result:
correct results
sql/mysql_priv.h:
new parameter for setup_tables()
sql/sql_base.cc:
new parameter for setup_tables() added to avoid dropping query_id of fields during reinitialization subquery
sql/sql_class.cc:
layout fixed
sql/sql_help.cc:
new parameter for setup_tables()
sql/sql_insert.cc:
new parameter for setup_tables()
sql/sql_lex.cc:
removed incorrect code
sql/sql_load.cc:
new parameter for setup_tables()
sql/sql_olap.cc:
new parameter for setup_tables()
sql/sql_prepare.cc:
new parameter for setup_tables()
sql/sql_select.cc:
new parameter for setup_tables()
sql/sql_update.cc:
new parameter for setup_tables()
Added support for lower_case_table_names=2, which is to be used on case insensitive file systems.
This tells MySQL to preserve the used case of filenames and database names to make it esier to move files between cases sensitive can case insensitive file systems (like Windows and Linux)
client/mysqltest.c:
Indentation cleanup
include/myisam.h:
Made some pointers 'const'
mysql-test/mysql-test-run.sh:
Portability fix for OSX
sql/filesort.cc:
Safety fix (not needed for current code but needed for 5.0)
sql/ha_berkeley.cc:
More debugging
Changed 'create' to return error number
sql/ha_berkeley.h:
Added HA_FILE_BASED
sql/ha_innodb.cc:
Added missing DBUG_RETURN
sql/ha_isam.cc:
Changed create to return error number
sql/ha_isam.h:
Added HA_FILE_BASED
sql/ha_isammrg.h:
Added HA_FILE_BASED
sql/ha_myisam.cc:
Changed create to return error number
sql/ha_myisam.h:
Added HA_FILE_BASED
sql/ha_myisammrg.cc:
Changed create to return error number
sql/ha_myisammrg.h:
Added HA_FILE_BASED
sql/handler.cc:
Ensure that table engines gets table names in lower case even if we are using lower_case_table_names
Removed test for DB_TYPE_INNODB by ensuring that create method returns error number.
sql/handler.h:
Added HA_FILE_BASED
Made some struct entries 'const'
Added 'alias' for create to be able to create tables in mixed case on case insensitive file systems
sql/mysql_priv.h:
Support for lower_case_table_names=2
sql/mysqld.cc:
Support for lower_case_table_names=2
Moved test of case insenstive file system after all mutex are created
sql/set_var.cc:
Support for lower_case_table_names=2
sql/sql_class.h:
Indentation change
sql/sql_db.cc:
Support for lower_case_table_names=2
sql/sql_insert.cc:
Indentation change
sql/sql_parse.cc:
Support for lower_case_table_names=2
sql/sql_rename.cc:
Support for lower_case_table_names=2
Added missing 'unpack_filename' to RENAME which may fix a bug in RENAME TABLE on windows
sql/sql_show.cc:
If lower_case_table_name=2 is given, show original case in SHOW CREATE TABLE
sql/sql_table.cc:
Support for lower_case_table_names=2 for DROP TABLE, RENAME TABLE, ALTER TABLE and CREATE TABLE
Portability fixes
mysql-test/r/rpl_until.result:
Portability fix
mysql-test/t/rpl_until.test:
Portability fix
sql/slave.cc:
Write UNTIL position to logs (for debugging)
sql/slave.h:
Write UNTIL position to logs (for debugging)
sql/sql_acl.cc:
Fixed bug in table level privilege GRANT handling. (Bug #2178)
install-test-db did not substiture the path to charsets file, so tests failed with non-default collation incompiled, for example --with-collation=latin1_german1_ci
mysqld.cc:
better error messaging
sql/mysqld.cc:
better error messaging
mysql-test/install_test_db.sh:
install-test-db did not substiture the path to charsets file, so tests failed with non-default collation incompiled, for example --with-collation=latin1_german1_ci
BitKeeper/etc/ignore:
auto-union
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/r/heap_btree.result:
Auto merged
mysql-test/r/index_merge.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/join_outer.result:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/range.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_select.h:
Auto merged
sql/opt_range.cc:
Merge
mysql-test/r/func_str.result:
Test for the bug #2182: lpad returns incorrect result
mysql-test/t/func_str.test:
Test for the bug #2182: lpad returns incorrect result
sql/item_strfunc.cc:
Fix for the bug #2182: lpad returns incorrect result
client/mysqltest.c:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
Portability fixes
mysql-test/r/rpl_relayrotate.result:
Portability fix
mysql-test/t/rpl_relayrotate.test:
Portability fix.
sql/log_event.cc:
Removed ++ from uint4korr() becasue this caused side effects
sql/uniques.cc:
Removed not used argument to get_merge_buffers_cost()
Removed wrong cast which caused compiler failures
Cast arguments to ceil() to double (portability problem)
Fixed bug in ORDER BY on a small column (Bug #2147)
Fixed error from pthread_mutex_destroy() when one had wrong errmsg file
client/mysqltest.c:
Added handling of error on query send
(Needed for init_connection.test)
mysql-test/mysql-test-run.sh:
Added tracing of mysqldump and mysqlbinlog
mysql-test/r/init_connect.result:
Updated tests
mysql-test/r/order_by.result:
Added test for bug filesort bug
mysql-test/t/init_connect-master.opt:
Added proper quoting (for Solaris and OSF)
mysql-test/t/init_connect.test:
Portability fix
mysql-test/t/order_by.test:
Added test for bug #2147 (bug in filesort)
sql/filesort.cc:
Fixed bug in filesort (Bug #2147)
sql/item.h:
Clear 'fixed' on cleanup (For prepared statements)
sql/item_func.cc:
Protect mutex destroy.
(Fixed error from pthread_mutex_destroy() when one had wrong errmsg file)
sql/log_event.cc:
Portability fix
sql/sql_class.h:
Fixed compiler warning
sql/sql_prepare.cc:
Portability fix. (Some compilers doesn't support jump over variables declared in for())
Some code cleanup
mysql-test/r/sp.result:
Update results after adding quotes around function/procedure names
sql/sp.cc:
Moved DBUG_ENTER after all variable declarations
Eliminated some variables.
Added more DBUG_ENTER commands.
Added memory allocation checking in create_string()
Fixed memory leak in sp_show_create_function()
Removed usage of sprintf
sql/sql_parse.cc:
Simple cleanup
Fixed memory leaks for mailformed SP definitions
into mysql.com:/home/mysql_src/mysql-5.0-new-binlog-format
sql/ha_innodb.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
For previous commit I had run only rpl* tests, here the other ones had a
few surprises. Latest status:
- all tests pass
- all replication tests pass with Valgrind
This is the final-final commit & push.
Doc remains.
client/mysqlbinlog.cc:
Making remote mysqlbinlog work with the new format of 5.0.0, and still be
able to talk to older servers.
This is a quickfix, but now mysqlbinlog.test passes (mysqlbinlog seems to
work in Valgrind, too).
mysql-test/r/drop_temp_table.result:
result update
mysql-test/r/insert_select.result:
result update
mysql-test/r/mix_innodb_myisam_binlog.result:
result update
mysql-test/r/mysqlbinlog.result:
result update
mysql-test/t/mix_innodb_myisam_binlog.test:
position update
mysql-test/t/mysqlbinlog.test:
position update
sql/log_event.cc:
a comment (noticed the problem by watching the results of
mix_innodb_myisam_binlog.test)
into mysql.com:/home/mysql_src/mysql-5.0-new-binlog-format
include/my_sys.h:
Auto merged
mysql-test/r/rpl_max_relay_size.result:
Auto merged
mysql-test/r/rpl_rotate_logs.result:
Auto merged
mysql-test/r/rpl_trunc_binlog.result:
Auto merged
mysql-test/t/rpl_log_pos.test:
Auto merged
mysql-test/t/rpl_max_relay_size.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/rpl_trunc_binlog.test:
Auto merged
sql/ha_innodb.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/slave.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_repl.cc:
Auto merged
