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
include/my_global.h:
a fix (bug #10438: Raid stopped working because of change in atomic add detection).
In order to compile with atomic.h on itanium we redefine 'new' because it's used
as a local variable in this file and conflicts with a kernel header.
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.
into mysql.com:/home/jonas/src/mysql-5.0
BitKeeper/etc/logging_ok:
auto-union
mysql-test/t/ndb_restore.test:
Auto merged
ndb/src/cw/cpcd/Process.cpp:
Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
Auto merged
whith some multi update scenarios
Make sure to init GCI on correct operation before firering operation
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
Init gci, to make sure that fire_trig_ord gets correct GCI
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.
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
include/my_global.h:
Auto merged
sql/field.h:
Auto merged
sql/ha_berkeley.h:
Auto merged
sql/ha_heap.h:
Auto merged
sql/ha_innodb.h:
Auto merged
sql/ha_myisam.h:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_geofunc.h:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.h:
Auto merged
BitKeeper/deleted/.del-ha_isam.h~bf53d533be3d3927:
Auto merged
BitKeeper/deleted/.del-ha_isammrg.h~66fd2e5bfe7207dc:
Auto merged
sql/examples/ha_archive.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/opt_range.h:
Auto merged
sql/procedure.h:
Auto merged
sql/protocol.h:
Auto merged
sql/set_var.h:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_list.h:
Auto merged
sql/sql_select.h:
Auto merged
sql/sql_string.h:
Auto merged
sql/sql_udf.h:
Auto merged
sql/tztime.h:
Auto merged
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.
