client/client_priv.h:
Additional option for insert-ignore
client/mysqldump.c:
Additional insert-ignore, change of delayed variable to insert_option
mysql-test/r/mysqldump.result:
Test results for --ignore-insert option.
mysql-test/t/mysqldump.test:
New additions to the test.
mysql-test/r/sp.result:
Correct the result file for the changed test.
mysql-test/t/sp.test:
1) Correct the "fib" stored procedure and its initial data to be mathematical correct: fib(0) = 0
2) Do a small run of "fib" first, that is not likely to hit a memory limit (see entry 9937 in the bug DB).
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
BitKeeper/etc/logging_ok:
auto-union
mysql-test/r/create.result:
Auto merged
mysql-test/r/insert_update.result:
Auto merged
mysql-test/t/create.test:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_yacc.yy:
SCCS merged
mysql-test/r/create.result:
Update result
mysql-test/r/type_ranges.result:
Update result
mysql-test/t/archive.test:
Rewrite path for embedded server testing
BUILD/FINISH.sh:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/type_float.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
sql/ha_heap.cc:
Auto merged
mysql-test/r/create.result:
Merge changes
mysql-test/r/temp_table.result:
SCCS merged
mysql-test/t/temp_table.test:
Merge new tests
sql/item.cc:
Merge from 4.1
sql/sql_select.cc:
Merge from 4.1
I_S table columns information is available for any user
mysql-test/r/information_schema.result:
Fix for bug#10261: INFORMATION_SCHEMA.COLUMNS, incomplete result for non root user
mysql-test/t/information_schema.test:
Fix for bug#10261: INFORMATION_SCHEMA.COLUMNS, incomplete result for non root user
sql/sql_show.cc:
Fix for bug#10261: INFORMATION_SCHEMA.COLUMNS, incomplete result for non root user
slave_skip_errors in SHOW VARIABLES. (Bug #7800)
sql/structs.h:
Add SHOW_SLAVE_SKIP_ERRORS
sql/set_var.cc:
Add slave_compressed_protocol, slave_load_tmpdir, slave_skip_errors to list
of variables.
mysql-test/t/rpl_variables.test:
Add test for additional slave-related variables
mysql-test/r/rpl_variables.result:
Update results
sql/sql_show.cc:
Handle showing slave_skip_errors
sql/sql_acl.cc:
Fix for bug #9838: INFORMATION_SCHEMA.COLUMNS columns of granted views missing
-increase grant_version in acl_init, mysql_table_grant
-table privileges should be taken into account when we calculate column
grants
sql/sql_show.cc:
Fix for bug #9838: INFORMATION_SCHEMA.COLUMNS columns of granted views missing
use 'base_name', 'file_name' because 'tables->db', 'tables->tables' could be invalid in
case of view(derived tables).
Fix bug by moving TRUE/FALSE in with other literals.
mysql-test/r/create.result:
Test for Bug#9666
mysql-test/t/create.test:
Test for Bug#9666
sql/sql_yacc.yy:
Move TRUE/FALSE in with other literals.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
INSERT IGNORE...UPDATE causes break in protocol or unknown error message.
Fix so that protocol doesn't break by properly ignoring dups.
mysql-test/r/insert_update.result:
Test for Bug#9725
mysql-test/t/insert_update.test:
Test for Bug#9725
sql/sql_insert.cc:
Ignore the failure in update_row when IGNORE is set.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
thd->lex->derived_tables should be zero(it may be changed if we open a view)
mysql-test/r/check.result:
Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement
mysql-test/t/check.test:
Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement
sql/sql_table.cc:
Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement
fail.
mysql-test/r/innodb.result:
Test case for BUG#7709 - Boolean fulltext query against
unsupported engines does not fail added.
mysql-test/t/innodb.test:
Test case for BUG#7709 - Boolean fulltext query against
unsupported engines does not fail added.
sql/item_func.cc:
Check if table supports fulltext.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
DEFAULT_COLLTION_NAME field is added to SCHEMATA table
mysql-test/r/information_schema.result:
Fix for bug#8998: information_schema: Table SCHEMATA should report default collations
sql/sql_show.cc:
Fix for bug#8998: information_schema: Table SCHEMATA should report default collations
writing DROP and CREATE TRIGGER to binlog, disabling binlogging
of substatements, testing.
mysql-test/r/rpl_sp.result:
result update
mysql-test/t/rpl_sp.test:
removing useless lines, plus testing replication of triggers
sql/sql_trigger.cc:
trigger can be used to destroy slave, so only SUPER can create it by default.
If create|drop goes ok, binlog CREATE TRIGGER and DROP TRIGGER.
sql/sql_trigger.h:
disable binlogging of substatements of triggers (even if now triggers
can't do updates)
into mysql.com:/home/ram/work/mysql-5.0
include/my_global.h:
Auto merged
BitKeeper/etc/logging_ok:
auto-union
sql/share/charsets/Index.xml:
Auto merged
mysql-test/r/type_newdecimal.result:
test result fixed
mysql-test/t/type_newdecimal.test:
test case added
strings/decimal.c:
old code didn't work when both decimals had zero before the decimal point
mysql-test/r/type_newdecimal.result:
test result fixed
mysql-test/t/type_newdecimal.test:
test case added
sql/my_decimal.cc:
error message fixed
strings/decimal.c:
do_add function fixed
mysqltest. (Bug #10251)
client/mysqltest.c:
Remove duplication in quote-handling quote, and add handling
of backquote (`).
mysql-test/t/mysqltest.test:
Add test of identifiers containing quotes.
mysql-test/r/mysqltest.result:
Update results
mysql-test/r/case.result:
test result fixed
mysql-test/r/create.result:
test result fixed
mysql-test/r/distinct.result:
test result fixed
mysql-test/r/func_group.result:
test result fixed
mysql-test/r/func_op.result:
test result fixed
mysql-test/r/group_by.result:
test result fixed
mysql-test/r/metadata.result:
test result fixed
mysql-test/r/olap.result:
test result fixed
mysql-test/r/ps_2myisam.result:
test result fixed
mysql-test/r/ps_3innodb.result:
test result fixed
mysql-test/r/ps_4heap.result:
test result fixed
mysql-test/r/ps_5merge.result:
test result fixed
mysql-test/r/ps_6bdb.result:
test result fixed
mysql-test/r/ps_7ndb.result:
test result fixed
mysql-test/r/select.result:
test result fixed
mysql-test/r/sp.result:
test result fixed
mysql-test/r/type_decimal.result:
test result fixed
mysql-test/r/type_newdecimal.result:
test result fixed
mysql-test/r/union.result:
test result fixed
mysql-test/r/variables.result:
test result fixed
mysql-test/t/func_group.test:
test modified
mysql-test/t/olap.test:
test modified
mysql-test/t/type_decimal.test:
test modified
mysql-test/t/rpl_sp.test:
making test hostname-independent (don't know why the problem didn't appear on my machine)
mysql-test/r/rpl_sp.result:
result update
a stored procedure" (version 2).
To handle updates and inserts into view in SP properly we should set
lock types for tables of the view's main select when we are opening
view for prelocking purproses.
mysql-test/r/sp.result:
Added test case for bug #9841 "Unexpected read lock when trying to update
a view in a stored procedure"
mysql-test/t/sp.test:
Added test case for bug #9841 "Unexpected read lock when trying to update
a view in a stored procedure"
sql/sql_view.cc:
mysql_make_view():
To handle updates and inserts into view in SP properly we should set
lock types for tables of the view's main select when we are opening
view for prelocking purproses.
Also it is more correct to use LEX::select_lex::get_table_list()
instead of 'view_tables' variable for obtaining list of those
tables.
