another column gets rotten value.
mysql-test/r/type_newdecimal.result:
Added a test case for Bug#10232: update with subquery, precision math,
another column gets rotten value.
mysql-test/t/type_newdecimal.test:
Added a test case for Bug#10232: update with subquery, precision math,
another column gets rotten value.
include/my_global.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/mgmapi/mgmapi.cpp:
Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
ndb/src/ndbapi/ndberror.c:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_udf.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
configure.in:
Ignore 4.1 version change
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
merge 4.1
ndb/src/ndbapi/ClusterMgr.cpp:
merge
ndb/test/run-test/Makefile.am:
merge
sql/mysql_priv.h:
merge from 4.1
sql/table.cc:
Merge from 4.1
heap/hp_hash.c:
Fix for bug #9404: information_schema: Weird error messages with SELECT SUM() ... GROUP BY queries
use length in symbols instead of length in bytes
to calculate record length and key length
Detect conflicting options in SELECT
mysql-test/r/select.result:
Test for bug#8733
mysql-test/t/select.test:
Test for bug#8733
sql/mysql_priv.h:
New bit for ALL
sql/sql_yacc.yy:
We want to complain if DISTINCT or ALL is used in SELECT when a
conflicting option is already selected.
mysql-test/t/range.test:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_udf.h:
Auto merged
mysql-test/r/mysqldump.result:
Manual merge.
mysql-test/t/mysqldump.test:
Manual merge.
version-dependent information (which causes test failures when running the test with a
different version string)
mysql-test/r/mysqldump.result:
- fixed the results (removed the version-dependent comments to avoid a test failure)
mysql-test/t/mysqldump.test:
- added "--skip-comments" to avoid printing comments that include version-dependent information
(which causes test failures when running the test with a different version string)
mysql-test/r/mysqldump.result:
Brian's modifications made on Ramil's laptop.
mysql-test/t/mysqldump.test:
Brian's modifications made on Ramil's laptop.
sql/opt_range.cc:
Fix for bug #9798: Rollup crash with InnoDB in setup_sum_funcs().
Disable mix/max group by optimization for queries with rollup for now.
Note: the actual bug was hidden; if this optimization works with rollup
queries we will have to change some code:
the problem is that we call the join->make_sum_func_list() function against
changed thd->mem_root (see SQL_SELECT::test_quick_select()) which creates some
items for rollup, then we free that mem_root, then we try to reuse (free) those
items.
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
client/client_priv.h:
c
e
?
h
mysql-test/t/mysqldump.test:
Resolved conflict.
some optimisation of IF/NOT IF ptomised to Pem
mysql-test/r/sp.result:
test for bug#5963
mysql-test/t/sp.test:
test for bug#5963
sql/item.cc:
new method which return reference on Item for SP variables support
sql/item.h:
comment fixed
method added
sql/sp_head.cc:
preparation of item made separate function
we do not need new constant Item to check IF/IF NOT
support of passing correct address of item for fix_fields method
sql/sp_rcontext.cc:
support of Item address passing to fix_fields
sql/sp_rcontext.h:
support of correct address passing to fix_fields
sql/sql_class.cc:
support of correct item address passing to fix_field
Fix bug + include test case.
Enable outfile tests.
mysql-test/t/outfile.test:
Reenable outfile tests
Add test for Bug#8191
sql/sql_yacc.yy:
Fix Bug#8191
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Incomplete ALTER TABLE breaks MERGE compatibility
Fix implicit NOT NULL not set on ALTER of PK columns
mysql-test/r/alter_table.result:
Test for Bug#6236
mysql-test/t/alter_table.test:
Test for Bug#6236
sql/sql_table.cc:
Implicit NOT NULL not set on ALTER of PK columns
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
field names. (Bug #10286)
client/mysqldump.c:
Use a DYNAMIC_STRING for the 'INSERT ...' pattern so we can handle
an arbitrary number of fields. Also rename the internal cFlag to
opt_complete_insert so it is clear what it does.
mysql-test/t/mysqldump.test:
Add regression test for 10286
mysql-test/r/mysqldump.result:
Update results
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
