BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/fil/fil0fil.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
mysql-test/r/select_found.result:
Auto merged
mysql-test/r/type_set.result:
Auto merged
mysys/default.c:
Auto merged
sql/field.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/ctype-simple.c:
Auto merged
include/mysql_com.h:
Merge
sql/filesort.cc:
merge
(No really critical errors found, but a few possible wrong results)
innobase/dict/dict0dict.c:
Replace memcmp with comparison of characters to avoid warnings from purify when 'sptr' points to a very short string
mysql-test/r/select_found.result:
Add missing drop table
mysql-test/r/type_set.result:
More tests
mysql-test/t/select_found.test:
Add missing drop table
mysql-test/t/type_set.test:
More tests
mysys/my_init.c:
Avoid warning from purify (purify doesn't handle getrusage() properly)
sql/field.h:
enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters
sql/filesort.cc:
enum & set are sorted as numbers. This fixes an access to uninitialized memory when enum/set are multi-byte characters
sql/item_cmpfunc.cc:
Fixed warning from purify. (Not critical as the arguments are passed to a function but not used)
Allocate Arg_comparator() with 'new' instead of sql_alloc() to ensure proper initialization
sql/mysqld.cc:
Wait for signal handler to stop when running --bootstrap
(Fixes warning from purify)
sql/sql_insert.cc:
Initialize slot used by innodb.cc (not critical)
sql/sql_lex.h:
Better comments
sql/sql_repl.cc:
memcmp -> bcmp() to avoid warning from purify
sql/sql_select.cc:
Fix for out-of-bound memory reference when doing DISTINCT on const expressions
strings/ctype-simple.c:
Fixes to not access uninitialized memory
(Not critical)
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
my_like_range_simple to produce upper bound constants for LIKE "str_%" and similar expressions.
mysql-test/r/ctype_cp1251.result:
Test for BUG#8560
mysql-test/t/ctype_cp1251.test:
Test for BUG#8560
This bug is also known as WL#1639.
mysql-test/r/func_group.result:
Test case for stddev_pop, var_pop, stddev_samp, var_samp was added.
mysql-test/t/func_group.test:
Test case for stddev_pop, var_pop, stddev_samp, var_samp was added.
sql/item_sum.cc:
New functions stddev_samp and var_samp were added.
sql/item_sum.h:
New functions stddev_samp and var_samp were added.
sql/lex.h:
New functions stddev_pop, var_pop, stddev_samp and var_samp were added.
sql/sql_yacc.yy:
New functions stddev_pop, var_pop, stddev_samp and var_samp were added.
mysql-test/r/sp.result:
New test case for BUG#8757.
mysql-test/t/sp.test:
New test case for BUG#8757.
sql/sp_pcontext.cc:
Return the correct scope offset to cursors during parsing.
mysql-test/r/innodb.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/opt_range.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_select.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
sql/examples/ha_archive.cc:
Merge with global tree
(Use my changes)
sql/sql_parse.cc:
Remove 'tmp' fix to be able to run tests
Have to thd->set_time() before each substatement execution, to make
current_time() et al return different times within the same procedure.
mysql-test/r/sp.result:
New test case for BUG#6857: current_time() in STORED PROCEDURES.
Note: The actual call is disable, to save time when running with slow debugging tools.
mysql-test/t/sp.test:
New test case for BUG#6857: current_time() in STORED PROCEDURES.
Note: The actual call is disable, to save time when running with slow debugging tools.
sql/sp_head.cc:
Make current_time() et all work in stored procedures.
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Previously we only stored the first given error (the error sent to the client)
include/mysys_err.h:
Moved ER_FILENOTFOUND last to avoid getting 'error 0'
mysql-test/r/backup.result:
More warnings from in case of errors
mysql-test/r/innodb.result:
More warnings from in case of errors
mysql-test/r/key_cache.result:
More warnings from in case of errors
mysql-test/r/myisam.result:
More warnings from in case of errors
mysql-test/r/preload.result:
More warnings from in case of errors
mysql-test/r/repair.result:
More warnings from in case of errors
mysql-test/r/rpl_failed_optimize.result:
More warnings from in case of errors
mysql-test/r/subselect.result:
More warnings from in case of errors
mysql-test/t/backup.test:
Portability fix
mysql-test/t/innodb.test:
Avoid some warnings
mysql-test/t/myisam.test:
Portability fix
mysql-test/t/rpl_rotate_logs.test:
Portablitiy fix
mysys/errors.c:
Move ER_FILENOTFOUND last to avoid error 0
sql/mysql_priv.h:
Indentation change
sql/mysqld.cc:
Save all given errors for SHOW ERRORS
sql/protocol.cc:
Store new errors for SHOW ERROR
(Ignore those that are already reported with my_error())
sql/sql_class.cc:
More errors with SHOW ERROR
sql/sql_class.h:
More errors with SHOW ERROR
sql/sql_error.cc:
More errors with SHOW ERROR
sql/sql_parse.cc:
Temporary fix: Don't give error for the to-be-removed 'pre-open tables code'
sql/sql_show.cc:
More debugging
Don't register errors while populating schema tables.
(If we do, we get a LOT of warnings from information_schema.test)
sql/sql_table.cc:
Don't register errors from handler in drop table (as we already do it the upper level DROP TABLE code)
Don't register errors for 'restore_table' as in most cases the table doesn't exists
sql/sql_union.cc:
Use file->write_row() instead of 'write_record'.
This gives us easer to handle error messages and is faster than the old version
mysql-test-run runs with --sleep=10; otherwise GET_LOCK() times out
before being killed so we get 0 instead of NULL. Verified that it
works on our powermacg5 where the test was failing.
mysql-test/t/kill.test:
must always sleep 2 seconds, even if mysql-test-run runs with --sleep=10;
otherwise GET_LOCK() times out before being killed so we get 0 instead of NULL.
The warning sent is by itself ok, the problem was rather why it wasn't
sent on some other platforms...
The real problem was that a total_warn_count which was inconsistent with warn_list
was sent back with send_eof() during SP execution, which in turn cause a protocol
error in mysqltest.
mysql-test/r/sp.result:
Updated results after fixing bug in how total_warn_count is handled.
sql/protocol.cc:
Fixed bug that caused protocol errors with mysqltest. Don't send total_warn_count
with send_eof() during SP execution, as it's usually wrong anyway. (warn_list is
cleared)
sql/sql_parse.cc:
Reset total_warn_count if the warn_list has been cleared. This gets rid of
"empty" warnings after some CALLs.
mysql-test/r/ndb_condition_pushdown.result:
fix binary LIKE binary in ndb api
mysql-test/t/ndb_condition_pushdown.test:
fix binary LIKE binary in ndb api
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
fix binary LIKE binary in ndb api
ndb/src/ndbapi/NdbOperationInt.cpp:
fix binary LIKE binary in ndb api
ndb/src/ndbapi/NdbScanFilter.cpp:
fix binary LIKE binary in ndb api
BitKeeper/etc/logging_ok:
auto-union
include/mysql_com.h:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
is the same as the normal datadir for that database. (Bug #8707)
mysys/my_symlink2.c:
Expand path of linkname before checking it against filename to decide if
we need to create a link.
mysql-test/t/symlink.test:
Add new regression test
mysql-test/r/symlink.result:
Add new results
mysql-test/r/binlog.result:
binlog rotation after a big transation
mysql-test/r/rpl_rotate_logs.result:
innodb-dependent test removed
mysql-test/t/binlog.test:
binlog rotation after a big transation
mysql-test/t/rpl_rotate_logs.test:
innodb-dependent test removed
pushed some minutes ago)
mysql-test/r/ctype_ucs.result:
result fix
mysql-test/r/mysqlbinlog.result:
result fix
mysql-test/r/mysqlbinlog2.result:
result fix
mysql-test/r/rpl_charset.result:
result fix
mysql-test/r/user_var.result:
result fix
correct end_log_pos for Xid_log_event
mysql-test/r/binlog.result:
don't depend on the previous tests
mysql-test/r/rpl_rotate_logs.result:
correct end_log_pos for Xid_log_event
mysql-test/t/binlog.test:
don't depend on the previous tests
sql/handler.h:
comment
sql/log_event.cc:
advance position for Xid
sql/log_event.h:
comment
sql/sql_class.h:
correct end_log_pos for Xid_log_event
sql/sql_parse.cc:
make sure commit handler knows whether it's autocommit or not
into 52.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0
BitKeeper/etc/logging_ok:
auto-union
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/protocol.cc:
Auto merged
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/warnings.test:
Auto merged
sql/protocol.cc:
Auto merged
into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-5.0-ndb
sql/ha_ndbcluster.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
mysql-test/r/ndb_condition_pushdown.result:
Added more tests for condition pushdown to storage engine based on comments from code review
mysql-test/t/ndb_condition_pushdown.test:
Added more tests for condition pushdown to storage engine based on comments from code review
