into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1
configure.in:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/unireg.cc:
Auto merged
storage/ndb/include/kernel/ndb_limits.h:
Auto merged
storage/ndb/include/kernel/signaldata/GetTabInfo.hpp:
Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
Auto merged
storage/ndb/include/ndbapi/ndbapi_limits.h:
Auto merged
storage/ndb/include/transporter/TransporterDefinitions.hpp:
Auto merged
storage/ndb/src/common/transporter/Packer.cpp:
Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
we need proper rounding there
mysql-test/r/func_math.result:
test result fixed
mysql-test/t/func_math.test:
test case added
sql/item_func.cc:
my_double_round implementation added
sql/item_strfunc.cc:
my_double_round used
sql/mysql_priv.h:
my_double_round interface
- after review fixes
mysql-test/r/ndb_basic.result:
Test using table with long name
mysql-test/t/ndb_basic.test:
Test using table with long name
ndb/include/transporter/TransporterDefinitions.hpp:
Define constant for max section size
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Add check for not sending too long table name to ndb kernel
sql/item_func.cc:
a fix (bug #10599: Numeric function 'abs' make server crash).
Item_func_abs::decimal_op() now returns 0 if NULL.
trivial optimization - get rid of an extra jump for common situations.
fixed Item_func_neg::decimal_op() return value if NULL.
mysql-test/r/rpl_log.result:
Adding File_size to output of SHOW BINARY lOGS
mysql-test/r/rpl_rotate_logs.result:
Adding File_size to output of SHOW BINARY lOGS
sql/sql_repl.cc:
Adding File_size to output of SHOW BINARY lOGS
sql/item_func.cc:
a fix (bug #10599: Numeric function 'abs' make server crash).
Item_func_abs::decimal_op() and Item_func_neg::decimal_op()
now return 0 if NULL.
Trivial optimization - get rid of an extra jump for common situations.
BitKeeper/etc/logging_ok:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
storage/myisam/mi_check.c:
Auto merged
storage/ndb/src/common/util/version.c:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
mysql-test/r/grant_cache.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/grant_cache.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/handler.h:
Resolve merge
sql/table.cc:
Resolve merge
BitKeeper/etc/logging_ok:
auto-union
BUILD/compile-alpha-cxx:
Auto merged
BUILD/compile-alpha-debug:
Auto merged
configure.in:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
After review version.
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().
mysql-test/r/merge.result:
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
The test result.
mysql-test/t/merge.test:
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
The test case does not in all cases show the problem
without the bugfix. The improper memory allocation
might get through undetected in many cases.
sql/ha_myisammrg.h:
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
Set a table_flag for the MERGE engine telling that any index
might be unique without being specified as such.
sql/handler.h:
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
Added a new table_flag telling that any index
might be unique without being specified as such.
sql/sql_insert.cc:
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
Changed the freeing of the memory to be symmetric to its
allocation (my_safe_alloc -> my_safe_afree).
This is not directly related to the bug.
sql/table.cc:
Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICATE KEY UPDATE
Added a condition for MERGE tables. These do not have unique
indexes. But every key could be a unique key on the underlying
MyISAM table. So get the maximum key length for MERGE tables
instead of the maximum unique key length. This is used for
buffer allocation in write_record().
BitKeeper/deleted/.del-grant_cache-master.opt~1b04b4b1116a7a2:
Delete: mysql-test/t/grant_cache-master.opt
mysql-test/r/grant_cache.result:
query cache management moved inside test
mysql-test/t/grant_cache.test:
query cache management moved inside test to privent server reloading during test
sql/field.cc:
a fix (bug #10539: When inserting out of range value in BIT, different engines behaves differently).
we have to set the first byte only if there is(are) uneven bit(s).
Added test cases for bug #7914.
sql_select.cc:
Fixed bug #7914: rollup over expresssions such as sum(a)+1.
sql/sql_select.cc:
Fixed bug #7914: rollup over expresssions such as sum(a)+1.
mysql-test/t/olap.test:
Added test cases for bug #7914.
mysql-test/r/olap.result:
Added test cases for bug #7914.
to easily check the storage engine supports DELAYED).
client/mysqldump.c:
disabling --delayed-insert until BUG#7815 is fixed (need table def cae)
mysql-test/r/mysqldump.result:
as we disable --delayed-insert, result changes
mysql-test/r/rpl_variables.result:
A fix (bug #10703: rpl_variables.test failure).
"$SLAVE_LOAD_TMPDIR" may differ from the "$MYSQL_TEST_DIR/var/tmp".
mysql-test/t/rpl_variables.test:
A fix (bug #10703: rpl_variables.test failure).
"$SLAVE_LOAD_TMPDIR" may differ from the "$MYSQL_TEST_DIR/var/tmp".
into mysql.com:/usr/home/ram/work/5.0.b10339
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/set_var.cc:
Auto merged
