into lmy004.:/work/mysql-5.1-tt-copy-works
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/table.cc:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
merge
storage/ndb/src/ndbapi/ndberror.c:
merge
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
extra/Makefile.am:
Auto merged
mysql-test/t/disabled.def:
Merged from 5.0
sql/handler.cc:
Merged from 5.0
sql/mysqld.cc:
Merged from 5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
mysql-test/r/ndb_read_multi_range.result:
Auto merged
sql/ha_archive.cc:
SCCS merged
table' lockup".
Changes from the innodb-5.0-ss92 snapshot.
Do not call os_file_create_tmpfile() at runtime. Instead, create
all tempfiles at startup and guard access to them with mutexes.
innobase/btr/btr0sea.c:
Changes from the innodb-5.0ss92 snapshot.
innobase/include/buf0buf.h:
Changes from the innodb-5.0ss92 snapshot.
innobase/include/os0file.h:
Changes from the innodb-5.0ss92 snapshot.
innobase/include/srv0srv.h:
Changes from the innodb-5.0ss92 snapshot.
innobase/row/row0ins.c:
Changes from the innodb-5.0ss92 snapshot.
innobase/srv/srv0srv.c:
Changes from the innodb-5.0ss92 snapshot.
innobase/srv/srv0start.c:
Changes from the innodb-5.0ss92 snapshot.
mysql-test/r/innodb.result:
Changes from the innodb-5.0ss92 snapshot.
mysql-test/t/innodb.test:
Changes from the innodb-5.0ss92 snapshot.
sql/ha_innodb.cc:
Changes from the innodb-5.0ss92 snapshot.
client/mysqltest.c:
Add missing DBUG_VOID_RETURN
Log failure to run "system" into result log
Add DBUG_PRINT for the sleep value used in do_sleep
mysql-test/r/mysqltest.result:
Update test results
mysql-test/t/mysqltest.test:
Mask outpu from failed system command
Straighten out and comment behaviour for --require and --result in run_query
client/mysqltest.c:
If --require or --result has been provided for a query command->record_file file be set.
In that case it should either dump to file if recording or check with content in file if running.
mysql-test/r/mysqltest.result:
Fix up tests and results after merge
mysql-test/t/mysqltest.test:
Fix up tests and results after merge
Removed include/Makefile.am and the reference to it.
Deleted db/db0err.h and db directory.
Check index column sizes in a better way (bug 13315).
Fixed comments for memory allocation functions and added
some extra checks. Adapted callers.
BitKeeper/deleted/.del-Makefile.am~ab5c84d46412dc2e:
Delete: storage/innobase/include/Makefile.am
BitKeeper/deleted/.del-db0err.h~bfeec2efe86ac48b:
Delete: storage/innobase/db/db0err.h
mysql-test/r/innodb.result:
Changes from the innodb-5.1-ss28 snapshot.
mysql-test/t/innodb.test:
Changes from the innodb-5.1-ss28 snapshot.
sql/ha_innodb.cc:
Changes from the innodb-5.1-ss28 snapshot.
sql/ha_innodb.h:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/Makefile.am:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/configure.in:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/ha/ha0ha.c:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/ha0ha.h:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/ha0ha.ic:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/mem0mem.h:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/include/mem0mem.ic:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/lock/lock0lock.c:
Changes from the innodb-5.1-ss28 snapshot.
storage/innobase/mem/mem0mem.c:
Changes from the innodb-5.1-ss28 snapshot.
Make the distinction between "exception conditions" and "completion
conditions" (warning and "no data") as defined by the standard. The latter
should not terminate a routine if no handler is found in the lexical scope.
mysql-test/r/sp.result:
New test case for BUG#15231.
Moved part of the test for BUG#7049 to the new testcase (since it was actually
an example of 15231).
mysql-test/t/sp.test:
New test case for BUG#15231.
Moved part of the test for BUG#7049 to the new testcase (since it was actually
an example of 15231).
sql/sp_rcontext.cc:
Only search for matching condition handlers in caller's contexts if it's
an exception conditition.
into mysql.com:/home/jimw/my/mysql-5.1-clean
mysql-test/r/sp.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_db.cc:
Auto merged
sql/sql_delete.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_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/sql_base.cc:
Resolve conflict
table' lockup".
Changes from the innodb-4.1-ss11 snapshot.
Do not call os_file-create_tmpfile() at runtime. Instead, create
a tempfile at startup and guard access to it with a mutex.
Also, fix bugs:
10511: "Wrong padding of UCS2 CHAR columns in ON UPDATE CASCADE";
13778: "If FOREIGN_KEY_CHECKS=0, one can create inconsistent FOREIGN
KEYs". When FOREIGN_KEY_CHECKS=0 we still need to check that
datatypes between foreign key references are compatible.
Also, added test cases (also for bug 9802).
innobase/dict/dict0dict.c:
Changes from the innodb-4.1-ss11 snapshot
innobase/dict/dict0load.c:
Changes from the innodb-4.1-ss11 snapshot
innobase/include/dict0dict.h:
Changes from the innodb-4.1-ss11 snapshot
innobase/include/dict0load.h:
Changes from the innodb-4.1-ss11 snapshot
innobase/include/os0file.h:
Changes from the innodb-4.1-ss11 snapshot
innobase/include/rem0cmp.h:
Changes from the innodb-4.1-ss11 snapshot
innobase/include/srv0srv.h:
Changes from the innodb-4.1-ss11 snapshot
innobase/rem/rem0cmp.c:
Changes from the innodb-4.1-ss11 snapshot
innobase/row/row0ins.c:
Changes from the innodb-4.1-ss11 snapshot
innobase/row/row0mysql.c:
Changes from the innodb-4.1-ss11 snapshot
innobase/srv/srv0srv.c:
Changes from the innodb-4.1-ss11 snapshot
innobase/srv/srv0start.c:
Changes from the innodb-4.1-ss11 snapshot
libmysqld/ha_blackhole.cc:
Changes from the innodb-4.1-ss11 snapshot
mysql-test/r/innodb.result:
Changes from the innodb-4.1-ss11 snapshot
mysql-test/t/innodb.test:
Changes from the innodb-4.1-ss11 snapshot
sql/ha_innodb.cc:
Changes from the innodb-4.1-ss11 snapshot
into parts when converting to Unicode.
m_ctype.h:
Reorganizing mb_wc return codes to be able
to return "an unassigned N-byte-long character".
sql_string.cc:
Adding code to detect and properly handle
unassigned characters (i.e. the those character
which are correctly formed according to the
character specifications, but don't have Unicode
mapping).
Many files:
Fixing conversion function to return new codes.
ctype_ujis.test, ctype_gbk.test, ctype_big5.test:
Adding a test case.
ctype_ujis.result, ctype_gbk.result, ctype_big5.result:
Fixing results accordingly.
include/m_ctype.h:
Reorganizing mb_wc return codes to be able
to return "an unassigned N-byte long character".
Bug#15375 Unassigned multibyte codes are broken into parts when converting to Unicode.
mysql-test/r/ctype_big5.result:
Fixing results accordingly.
mysql-test/r/ctype_gbk.result:
Fixing results accordingly.
mysql-test/r/ctype_ujis.result:
Fixing results accordingly.
mysql-test/t/ctype_big5.test:
Adding a test case.
mysql-test/t/ctype_gbk.test:
Adding a test case.
mysql-test/t/ctype_ujis.test:
Adding a test case.
sql/sql_string.cc:
Adding code to detect and properly hanlde
unassigned characters (i.e. the those character
which are correctly formed according to the
character specifications, but don't have Unicode
mapping).
strings/ctype-big5.c:
Fixing conversion function to return new codes.
strings/ctype-bin.c:
Fixing conversion function to return new codes.
strings/ctype-cp932.c:
Fixing conversion function to return new codes.
strings/ctype-euc_kr.c:
Fixing conversion function to return new codes.
strings/ctype-gb2312.c:
Fixing conversion function to return new codes.
strings/ctype-gbk.c:
Fixing conversion function to return new codes.
strings/ctype-latin1.c:
Fixing conversion function to return new codes.
strings/ctype-simple.c:
Fixing conversion function to return new codes.
strings/ctype-sjis.c:
Fixing conversion function to return new codes.
strings/ctype-tis620.c:
Fixing conversion function to return new codes.
strings/ctype-ucs2.c:
Fixing conversion function to return new codes.
strings/ctype-ujis.c:
Fixing conversion function to return new codes.
strings/ctype-utf8.c:
Fixing conversion function to return new codes.
Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
mysql-test/t/rpl_until.test:
Auto merged
mysql-test/r/rpl_until.result:
Manual merge from 4.1,
extension of the old fix (1.1976 05/12/05 17:57:48 mleich@mysql.com) to two other places.
Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
The value is not important, and it depends on timing. Mask it.
Backport and extension of a fix made by Matthias in 5.0, originally it was
1.1976 05/12/05 17:57:48 mleich@mysql.com
mysql-test/r/rpl_until.result:
Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
The value is not important, and it depends on timing. Mask it.
Backport and extension of a fix made by Matthias in 5.0, originally it was
1.1976 05/12/05 17:57:48 mleich@mysql.com
mysql-test/t/rpl_until.test:
Fix for bug#12429: Replication tests fail: "Slave_IO_Running" differs:
The value is not important, and it depends on timing. Mask it.
Backport and extension of a fix made by Matthias in 5.0, originally it was
1.1976 05/12/05 17:57:48 mleich@mysql.com
Ignore columns with unpredictable values.
rpl_relayrotate.result:
Changed result file to match change in test
mysql-test/r/rpl_relayrotate.result:
Changed result file to match change in test
mysql-test/t/skip_name_resolve.test:
Ignore columns with unpredictable values.
mysql-test/r/skip_name_resolve.result:
Ignore columns with unpredictable values.
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
mysql-test/t/symlink.test:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/mysqld.cc:
Auto merged
into mysql.com:/home/dlenev/src/mysql-5.1-merges
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
into neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
client/mysqltest.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/union.test:
Auto merged
mysql-test/r/mysqltest.result:
Manual merge
mysql-test/t/mysqltest.test:
Manual merge
error message if database is changed.
mysql-test/r/rpl_trigger.result:
Fixed results for the added test cases
mysql-test/t/rpl_trigger.test:
Added test cases for bug #14614
sql/sql_db.cc:
Fixed bug #14614.
Modified mysql_change_db(): The memory where db name resides
is freed by a slave thread.
Now when we create or drop trigger we check that both trigger name and trigger
table always have database part specified. Thus we give an error if it they
are not specified explicitly or implicitly via current database.
mysql-test/r/trigger.result:
Added test for bug #14863 "Triggers: crash if create and there is no current
database".
mysql-test/t/trigger.test:
Added test for bug #14863 "Triggers: crash if create and there is no current
database".
sql/sql_trigger.cc:
mysql_create_or_drop_trigger():
Now we check that both trigger name and trigger table have database
part specified (explicitly or implicitly via current database. Note
that in latter case sp_name::m_db is already set by parser).
Table_triggers_list::create_trigger()/::add_table_for_trigger():
Simplified method/function's code since now they can assume that
sp_name::m_db is always filled now.
trigname_file_parameters:
Removed comment which is no longer true.
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
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_yacc.yy:
Auto merged
mysql-test/r/analyze.result:
test result fixed
mysql-test/t/analyze.test:
test case added
sql/sql_table.cc:
we don't need to remove temporary table from the cache,
but we need to reload it's info
in NDB that the fix would cause due to improper registration of a transaction
that isn't meant to be seen by the handler layer. (Bug #14212)
Thanks to Sergei Golubchik for helping with this.
mysql-test/r/bdb.result:
Add new result
mysql-test/t/bdb.test:
Add new regression test
sql/ha_ndbcluster.cc:
Don't register transaction if transactions are "disabled".
sql/handler.cc:
Commit statement before trying to end transaction.
cmp_item_sort_string::cmp() wasn't checking values_res variable for null.
Later called function was dereferenced it and crashed server.
Added null check to cmp_item_sort_string::cmp().
sql/item_cmpfunc.h:
Fix bug#15268 Unchecked null value caused server crash
Added null check to cmp_item_sort_string::cmp().
mysql-test/t/select.test:
Test case for bug#15268 Unchecked null value caused server crash
mysql-test/r/select.result:
Test case for bug#15268 Unchecked null value caused server crash
mysql-test/t/mysqltest.test:
Fix for bug #15605: 5.0.17 test case 'mysqltest' failure.
- use 'test -s' instead of 'cat' to get assured 1 (cat returns >0 in case of errors)
