Commit graph

9138 commits

Author SHA1 Message Date
unknown
9f444445bc Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  regul.home.lan:/mnt/md/bk/mysql-5.0
2005-12-16 22:15:53 +02:00
unknown
5c12976f53 BUG#15805: Disabled test type_time; fails in --ps-protocol mode.
mysql-test/t/disabled.def:
  Disabled test type_time; fails in --ps-protocol mode.
2005-12-16 09:38:30 +01:00
unknown
7c4ada147e Fixed stress parts in shell and perl versions of mysql-test-run script to limit stress testing
with 20 test loops in case when any limit parameter was specified



mysql-test/lib/mtr_stress.pl:
  Limit stress testing with 20 test loops in case when any limit parameter was specified
mysql-test/mysql-test-run.pl:
  Limit stress testing with 20 test loops in case when any limit parameter was specified
mysql-test/mysql-test-run.sh:
  Limit stress testing with 20 test loops in case when any limit parameter was specified
2005-12-16 00:23:55 +02:00
unknown
4db14a57e7 Merge mysql.com:/home/alexi/dev/mysql-4.1-12440
into  mysql.com:/home/alexi/dev/mysql-5.0-12440


mysql-test/r/type_time.result:
  Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql-common/my_time.c:
  Auto merged
zlib/Makefile.am:
  Auto merged
2005-12-15 18:59:40 +03:00
unknown
52c0440085 Fixed BUG #12440: "Incorrect processing of time values containing
long fraction and/or large exponent part".


mysql-test/r/type_time.result:
  Fixed testcases results (bug #12440)
mysql-test/t/type_time.test:
  Added testcases for bug #12440
sql-common/my_time.c:
  Fixed bug #12440: "Incorrect processing of time values containing
   long fraction and/or large exponent part".
   Modified str_to_time(). Process properly fraction part containing
   more than 6 digits. Check for existence of exponent part which
   may result from %g formatting applied to time value specified as
   large real number.
2005-12-15 18:48:08 +03:00
unknown
9a3cc2827c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-14 16:50:28 +01:00
unknown
c1d403cb09 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-12-14 14:49:59 +01:00
unknown
61cb138083 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-12-14 14:48:42 +01:00
unknown
7e450c3944 Merge mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-12-14 14:46:24 +01:00
unknown
d70270c41f Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable
mysql-test/r/ndb_multi.result:
  Fix to make ndb_multi.test (Bug #15401  NDB lock problems) more preditable
mysql-test/t/ndb_multi.test:
  Fix to make ndb_multi.test (Bug #15401  NDB lock problems) more preditable
2005-12-14 14:45:13 +01:00
unknown
479808bee0 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
sql/sp_head.cc:
  Auto merged
2005-12-14 13:18:24 +01:00
unknown
d051f62811 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


sql/mysqld.cc:
  Auto merged
2005-12-14 13:09:41 +01:00
unknown
ed5f4d69bc Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
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
2005-12-14 11:34:08 +01:00
unknown
2c808bed24 bug#15682 - ndb - invalid handling of varchar in position/rnd_pos
mysql-test/r/ndb_basic.result:
  bug#15682 - invalid handling of varchar in position/rnd_pos
mysql-test/t/ndb_basic.test:
  bug#15682 - invalid handling of varchar in position/rnd_pos
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  New error code for invalid key
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Handle invalid key gracefully
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Handle invalid key gracefully
ndb/src/ndbapi/ndberror.c:
  New error code
sql/ha_ndbcluster.cc:
  Fix varchar keys in position/rnd_pos
2005-12-14 10:57:09 +01:00
unknown
06042b36f4 Disabled test. Fails in ps-protocol mode. 2005-12-14 02:56:34 +02:00
unknown
67183a7b8a Fixed test case. 2005-12-14 00:23:46 +02:00
unknown
27970ee72e Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/15268-bug-5.0-mysql
2005-12-13 23:26:35 +03:00
unknown
11b6afd3b3 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92
2005-12-13 22:29:36 +03:00
unknown
778d212b8c Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting for
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.
2005-12-13 21:35:24 +03:00
unknown
a0a942fb6f Bug#15675 - ndb - fix read_multi_range.test drop all tables it using
NOTE: only changes to test script


mysql-test/t/ndb_read_multi_range.test:
  Bug#15675 - ndb - fix read_multi_range.test drop all tables it using
2005-12-13 17:33:19 +01:00
unknown
47ed572f3f BUG#15624: Use --real_sleep in rpl_deadlock.test to avoid breaking when run with --sleep.
mysql-test/t/rpl_deadlock.test:
  BUG#15624: Use --real_sleep to avoid breaking when run with --sleep.
2005-12-13 11:42:10 +01:00
unknown
8c911a25fe Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss11
2005-12-12 22:46:49 +03:00
unknown
50bcb9623d Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-12-12 11:39:33 -08:00
unknown
d6e5fdf08a Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean


mysql-test/r/bdb.result:
  Resolve conflicts
mysql-test/t/bdb.test:
  Resolve conflicts
sql/sql_delete.cc:
  Resolve conflicts
sql/sql_insert.cc:
  Resolve conflicts
sql/sql_update.cc:
  Resolve conflicts
2005-12-12 10:11:56 -08:00
unknown
8bf4a099a5 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1
2005-12-12 19:11:21 +01:00
unknown
8e3f95b555 Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for
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
2005-12-12 21:06:59 +03:00
unknown
edf3915a07 Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/bug12429 2005-12-12 19:04:47 +01:00
unknown
2e3f97e54a Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-release
into mysql.com:/M50/clone-5.0
2005-12-12 19:00:08 +01:00
unknown
45f2e2ae13 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/bug12429 2005-12-12 18:54:35 +01:00
unknown
f149343213 Merge mysql.com:/M50/bug12429 into mysql.com:/M50/clone-5.0 2005-12-12 18:44:01 +01:00
unknown
cc3f2163c3 rpl_until.test + rpl_until.result Fix (completion) for bug#12429
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.
2005-12-12 18:00:37 +01:00
unknown
56830072d3 rpl_until.test + 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/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
2005-12-12 17:51:56 +01:00
unknown
d9d7b44c3b skip_name_resolve.result, skip_name_resolve.test:
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.
2005-12-12 16:58:20 +01:00
unknown
0a2cef6a84 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-12 11:58:16 +01:00
unknown
95cabee1dc Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/alexi/dev/mysql-5.0-14614
2005-12-12 13:16:06 +03:00
unknown
a21e8517ed Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into  mysql.com:/usr/home/ram/work/mysql-5.0-release
2005-12-12 11:55:49 +04:00
unknown
a26e2c2009 Fixed BUG #14614: Replication of tables with trigger generates
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.
2005-12-11 17:06:36 +03:00
unknown
53f8fed437 Merge rurik.mysql.com:/home/igor/mysql-5.0
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
2005-12-10 23:31:03 -08:00
unknown
cb06e0c125 Fix bug #15268 Unchecked null value caused server crash
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
2005-12-09 23:01:52 +03:00
unknown
6abb702cf9 Fix for bug #15605: 5.0.17 test case 'mysqltest' failure.
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)
2005-12-09 20:18:25 +04:00
unknown
171d9fcb38 Merge mysqldev@production.mysql.com:my/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
2005-12-09 15:32:07 +01:00
unknown
8ec8f2d745 trigger-grant.test, trigger-compat.test:
Removed --text from grep, not portable


mysql-test/t/trigger-compat.test:
  Removed --text from grep, not portable
mysql-test/t/trigger-grant.test:
  Removed --text from grep, not portable
2005-12-09 15:28:20 +01:00
unknown
70d3e45ba9 Attempt to fix rpl_relayrotate.test for host openbsd, fix suggested by Guilhem 2005-12-09 14:38:35 +01:00
unknown
9c4985de77 A fix and a test case for Bug#15441 "Running SP causes Server
to Crash": the bug was that due to non-standard name
resolution precedence in stored procedures (See Bug#5967)
a stored procedure variable took precedence over a table column
when the arguments for VALUES() function were resolved.
The implementation of VALUES() function was not designed to work
with Item_splocal and crashed.
VALUES() function is non-standard. It can refer to, and
is meaningful for, table columns only. The patch disables SP 
variables as possible arguments of VALUES() function.


mysql-test/r/sp.result:
  Test results fixed (Bug#15441).
  Also make sure that the recently added test cases follow sp.test
  internal tests standard.
mysql-test/t/sp.test:
  Add a test case for Bug#15441 "Running SP causes Server to Crash".
sql/item.cc:
  Cleanup Item_insert_value::fix_fields().
sql/item.h:
  Add a comment for Item_insert_value.
sql/sql_yacc.yy:
  Actual fix for Bug#15441 "Running SP causes Server to Crash":
  we should not allow VALUES() function to reference SP variables.
2005-12-09 00:58:59 +03:00
unknown
ab597139a7 Fix calls to free_underlaid_joins() in INSERT, DELETE, and UPDATE
handling so that indexes are closed before trying to commit the
transaction. (Bug #15536)


mysql-test/r/bdb.result:
  Add new results
mysql-test/t/bdb.test:
  Add new test
sql/sql_delete.cc:
  Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().
sql/sql_insert.cc:
  Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().
sql/sql_update.cc:
  Move call to free_underlaid_joins() to before ha_autocommit_or_rollback().
2005-12-08 12:33:33 -08:00
unknown
698b4937f1 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-08 17:58:17 +01:00
unknown
51fd81acf4 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


mysql-test/t/symlink.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
2005-12-08 16:15:27 +01:00
unknown
eea6e15d11 mysqld.cc:
Bug#14960, reverted code to make symdir work on Windows
symlink.test:
  Disabled test case on Windows


mysql-test/t/symlink.test:
  Disabled test case on Windows
sql/mysqld.cc:
  Bug#14960, reverted code to make symdir work on Windows
2005-12-08 16:13:53 +01:00
unknown
3b3034edc3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-12-07 23:07:06 +03:00
unknown
06e9966396 Fix commit error: sp-vars.test should belong to mysql-test/t directory.
mysql-test/t/sp-vars.test:
  Rename: mysql-test/sp-vars.test -> mysql-test/t/sp-vars.test
2005-12-07 22:06:30 +03:00