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
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
new tests
mysql-test/r/innodb.result:
savepoint test
mysql-test/t/innodb.test:
savepoint test
sql/log.cc:
write "COMMIT" into binlog if there's no Xid at the end of transaction
BitKeeper/etc/logging_ok:
auto-union
mysql-test/mysql-test-run.sh:
Auto merged
ndb/src/kernel/vm/Emulator.cpp:
Auto merged
ndb/src/kernel/vm/Emulator.hpp:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
ndb/src/kernel/main.cpp:
merge
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/rpl_charset.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/t/rpl_charset.test:
Manual merge
sql/log_event.cc:
Manual merge
In Item_cache_decimal::store(item) the call item->val_decimal_result()
returns NULL if the passed item has an SQL null value. Don't try copying
NULL into Item_cache_decimal::val in this case.
mysql-test/r/type_decimal.result:
Test for BUG#8397
mysql-test/t/type_decimal.test:
Test for BUG#8397
sql/item.cc:
Fix for BUG#8397: In Item_cache_decimal::store(item) the call
item->val_decimal_result() returns NULL if the passed item has an SQL null
value. Don't try copying NULL into Item_cache_decimal::val in this case.
mysql-test/r/strict.result:
Update tests after merge
mysql-test/t/strict.test:
Update tests after merge (We can't handle 2.2E-307) anymore as this is out of range with the new method to calculate double
sql/item_sum.h:
After merge fix
use my_strtoll10 instead of my_strtonll
include/my_sys.h:
sol9x86, sunfire100b, qnx compatibility
mysql-test/t/rpl_rotate_logs.test:
fix the test
sql/ha_innodb.cc:
don't bother
sql/handler.cc:
few more ways to crash mysqld :)
sql/handler.h:
gdb/safemalloc workaround
sql/log.cc:
rotate a binlog on heuristic recover
sql/mysqld.cc:
rotate a binlog on heuristic recover
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
extra/my_print_defaults.c:
Auto merged
include/m_string.h:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/user_var.result:
Auto merged
mysql-test/t/user_var.test:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
strings/ctype-simple.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
strings/ctype-utf8.c:
Auto merged
libmysql/libmysql.c:
ul
mysql-test/r/ps_1general.result:
Merge
mysql-test/t/derived.test:
Merge
mysql-test/t/ps_1general.test:
Merge
mysql-test/t/type_float.test:
Merge
sql/field.cc:
ul
sql/item.cc:
ul
sql/item.h:
ul
sql/item_func.h:
ul
sql/item_strfunc.cc:
ul
sql/item_sum.cc:
ul
sql/item_sum.h:
ul
sql/procedure.h:
ul
sql/sql_derived.cc:
Trivial merge
sql/sql_parse.cc:
ul
sql/sql_update.cc:
Trivial merge
strings/strtod.c:
Use updated code from 4.1
This is bascily same code as we had before or 5.0, execpt that we now have higher accuracy for floating points value that are integers (like 123.45E+02)
