Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 13:12:10 +02:00
A test case for Bug#6073 "ALTER TABLE minor glitch" (can't repeat)
2006-01-17 00:28:00 +03:00
Fixed bug #19714 .
2006-07-13 20:48:26 -07:00
Add missing drop table
2006-05-29 16:27:45 +02:00
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
2006-05-04 18:35:58 +03:00
Manually merged
2006-06-17 02:57:50 +04:00
Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table.
2005-10-26 13:55:08 -07:00
BUG#14770 - LOAD DATA INFILE doesn't respect default values for
2006-08-02 17:15:50 +05:00
Make it possible to run mysql-test-run.pl with default test suite in different vardir.
2006-01-24 08:30:54 +01:00
Fix compilation failures on Windows caused by the patch for Bug#17199.
2006-06-27 14:56:24 +04:00
fix test results - Bug #11328
2005-06-16 10:09:05 +02:00
Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table.
2005-10-26 13:55:08 -07:00
Fixed bug #19714 .
2006-07-13 20:48:26 -07:00
Expanding a binary field should result in 0x00-filled positions, not 0x20
2006-03-02 20:49:10 -05:00
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +02:00
Revoking patch for Bug#10952 on behalf of Brian.
2006-07-10 20:46:05 +02:00
Bug#17048 CREATE TABLE ... SELECT truncate values
2006-05-13 13:13:05 +05:00
Bugs#17647: Trouble with "create database"
2006-05-04 11:55:09 +05:00
Bug #17903 : cast to char results in binary
2006-07-12 13:22:38 -07:00
Fix for bug#9897: Views: 'Check Table' crashes MySQL, with a view and a table in the statement
2005-05-07 12:17:54 +00:00
Merge problem fixes
2005-06-27 12:25:15 +02:00
Bug #21159 : Optimizer: wrong result after AND with different data types
2006-08-15 10:13:17 +03:00
Post-merge fixes
2006-05-31 22:55:45 -07:00
mysql-test/r/connect.result + mysql-test/t/connect.test
2005-11-07 22:30:44 +01:00
Fix bug #9593 "The combination of COUNT, DISTINCT and CONCAT seems to lock the
2005-05-30 03:32:50 +04:00
WL#926 "AVG(DISTINCT) and other distincts", part 2 (out of 3): clean up
2005-03-15 03:46:19 +03:00
Bug #21772 : can not name a column 'upgrade' when create a table in version 5.0.24
2006-09-08 13:10:14 +03:00
BUG#19479: mysqldump creates invalid dump
2006-06-04 21:27:41 +03:00
Add new option "check-testcases" to mysql-test-run.pl
2006-01-26 17:54:34 +01:00
Fix Bug#15205 "Select from CSV table without the datafile causes crash"
2006-07-11 15:54:52 +04:00
Bug#15375 Unassigned multibyte codes are broken
2005-12-12 21:42:09 +04:00
merge
2005-04-11 15:11:52 +05:00
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +02:00
BUG#18293 (Values in stored procedures written to binlog unescaped):
2006-03-21 14:35:49 +01:00
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +02:00
Bug#19741 segfault with cp1250 charset + like + primary key + 64bit os
2006-07-25 17:27:53 +05:00
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05:00
Bug#15376: Unassigned multibyte codes are converted to U+0000
2006-03-23 14:03:39 +04:00
Bug#15377 Valid multibyte sequences are truncated on INSERT
2005-12-09 16:37:58 +04:00
Bug#15377 Valid multibyte sequences are truncated on INSERT
2005-12-09 16:37:58 +04:00
Bug#15375 Unassigned multibyte codes are broken
2005-12-12 21:42:09 +04:00
This problem has already been fixed by one of the previous changes.
2006-04-06 10:51:23 +05:00
Bug#9509 Optimizer: wrong result after AND with latin1_german2_ci
2005-05-05 21:13:57 +05:00
Bug#6505 Wrong sorting order:
2005-05-06 18:41:41 +05:00
Cleanup test cases that leaves "stuff" behind
2006-04-18 18:10:47 +02:00
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05:00
merge bug##7943: Wrong prefix lengths reported on UTF-8 columns
2005-01-21 16:55:17 +04:00
Add new option "check-testcases" to mysql-test-run.pl
2006-01-26 17:54:34 +01:00
don't let bugfix for bug#8303 break the bugfix for bug#8378
2006-05-24 00:55:53 +02:00
Merge msdesk.(none):/home/msvensson/mysql-4.1
2005-10-06 14:40:18 +02:00
ctype_uca.result, ctype_uca.test:
2005-12-23 14:20:00 +04:00
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
2006-06-22 16:18:54 -07:00
Bug#15276: MySQL ignores collation-server
2006-06-23 18:00:49 +05:00
BUG#16217 forced to introduce a separate mysql client command to adopt its
2006-02-09 16:23:09 +02:00
Bug#15376: Unassigned multibyte codes are converted to U+0000
2006-03-23 14:03:39 +04:00
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
2006-08-16 16:04:10 +02:00
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
2006-07-23 13:43:44 +05:00
test case fixed to pass w/o innodb
2005-09-25 15:44:05 +02:00
Bug #20195 : INSERT DELAYED with auto_increment is assigned wrong values
2006-06-13 18:18:32 +03:00
Merge macbook.gmz:/Users/kgeorge/mysql/work/B21392-4.1-opt
2006-09-04 18:45:48 +03:00
A fix and a test case for Bug#21002 "Derived table not selecting from a
2006-07-19 22:33:19 +04:00
4.1->5.0 merge for bug #16458
2006-06-28 15:53:54 +03:00
Fixed core dump bug when hot link list in key cache was empty. Bug #10167
2005-04-27 14:31:04 +03:00
BUG#14157: utf8 encoding in binlog without set character_set_client e.g DROP temporary
2006-05-09 23:01:31 +03:00
Import Heikki's patch which was applied to the main tree only.
2005-03-20 14:38:51 +01:00
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
Merge rurik.mysql.com:/home/igor/tmp_merge
2006-05-31 18:10:02 -07:00
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
2006-08-14 21:27:36 -07:00
Improvement to federated for BUG#12659
2005-09-13 23:31:17 -07:00
Added testcase for BUG#13118
2005-09-16 16:17:44 -07:00
More DBUG statements
2006-05-24 17:21:35 +03:00
mysql-test/r/flush_block_commit.result
2005-04-12 23:08:19 +02:00
Fix bug #11934 Two sequential FLUSH TABLES WITH READ LOCK hangs client
2005-08-03 02:01:27 +04:00
Bug#18071 Result from MATCH() uses too many decimals
2006-03-22 14:57:24 +01:00
BUG#16489 - utf8 + fulltext leads to corrupt index file.
2006-01-23 17:15:33 +04:00
Windows compatibility changes of the 'rpl_delete_all',
2005-02-17 02:59:39 +01:00
Bug #19498 : Inconsistent support for DEFAULT in TEXT columns
2006-07-18 16:04:18 -07:00
Bug#14708: Inconsistent treatment of NULLs in LEFT JOINed FULLTEXT matching without index
2006-06-16 09:49:18 +02:00
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
Bug #19498 : Inconsistent support for DEFAULT in TEXT columns
2006-07-18 16:04:18 -07:00
fulltext_var.result:
2005-08-29 22:35:48 -05:00
Bug#18539 uncompress(d) is null: impossible?
2006-07-18 12:41:41 +02:00
Many files:
2006-06-15 01:48:41 +04:00
Handle errors returned by system crypt() in ENCRYPT(). (Bug #13619 )
2005-10-06 16:15:53 -07:00
Clean up merge from 4.1
2005-08-15 14:19:56 -07:00
Addition to fix for bug #11314 (test case wasn't complete)
2005-06-14 17:50:24 +05:00
Fix crash caused by calling DES_ENCRYPT() without the --des-key-file
2005-07-07 11:49:44 -07:00
Portability fixes
2005-06-27 20:31:00 +03:00
Fix test after last push
2005-06-27 20:31:02 +03:00
Merge mysql.com:/home/jimw/my/mysql-4.1-12612
2005-12-01 12:07:25 -08:00
Merge macbook.gmz:/Users/kgeorge/mysql/work/B16792-4.1-opt
2006-09-05 17:09:12 +03:00
Merge bug #16792 4.1->5.0
2006-09-05 19:07:55 +03:00
Fixed bug#16272: IF function with decimal args can produce wrong result
2006-02-14 16:22:37 +03:00
Merge
2006-06-20 00:52:26 +04:00
Merge mysql.com:/usr/home/bar/mysql-4.1.b12611
2005-09-07 16:32:15 +05:00
Bug#17203: "sql_no_cache sql_cache" in views created from prepared statement
2006-06-27 21:28:32 +04:00
Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge
2006-05-06 19:45:24 +04:00
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2006-04-13 15:07:50 +03:00
Merge
2006-06-30 02:03:09 +04:00
Fixed BUILD script to use --with-berkeley-db instead of --with-bdb
2005-02-19 18:58:27 +02:00
Post-pushbuild corrections for fix of bug #21698 .
2006-09-09 09:43:09 -07:00
Bug#17203: "sql_no_cache sql_cache" in views created from prepared statement
2006-06-27 21:28:32 +04:00
func_str.result, null.result:
2005-08-26 22:25:45 -07:00
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint_20328
2006-08-16 19:31:33 -04:00
#19409 : Test 'func_timestamp' fails on Windows x64
2006-06-22 20:50:38 +02:00
Bug #19498 : Inconsistent support for DEFAULT in TEXT columns
2006-07-18 16:04:18 -07:00
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
2006-08-04 19:19:26 +02:00
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/tmp_merge
2006-08-17 10:47:23 -04:00
Merge updates.
2006-08-10 12:39:18 -04:00
sql/sql_acl.cc
2005-03-23 19:18:25 +01:00
Resolve merge from 4.1
2005-05-18 13:54:36 -07:00
Fix for BUG#7266.
2004-12-16 16:44:40 +02:00
Fixed bug #5500 : EXPLAIN returned a wrong select_type for queries using views.
2006-09-06 08:21:43 -07:00
Fix for BUG#21007.
2006-07-21 11:59:46 +03:00
Review fixes of new pushed code
2006-01-06 00:47:49 +02:00
Additional storage engine called "blackhole". Customer request, and for that matter a Zawodny request. With this you can alter table to a type of table that would never store data. Its a /dev/null for a database.
2005-03-22 16:10:39 -08:00
Added cp932 character set
2005-05-05 10:36:17 -07:00
Bug#8840 Empty string comparison and character set 'cp1250'
2005-03-03 14:15:37 +04:00
Skip cp932 and eucjpms tests when the character sets are not compiled.
2005-02-01 14:37:51 +04:00
Bug#15377 Valid multibyte sequences are truncated on INSERT
2005-12-09 16:37:58 +04:00
Fix for crummy compiler that didn't udnerstand for declaration. Another fix for example storage engine to pass, not skip, test.
2004-12-06 16:26:05 -08:00
-Added quote_data and needs_quotes (moved from federated handler.
2005-01-20 18:36:40 -08:00
Bug#15377 Valid multibyte sequences are truncated on INSERT
2005-12-09 16:37:58 +04:00
ctype-gbk.c:
2005-07-22 21:06:02 +05:00
Bug#17374: select ... like 'A%' operator fails to find value on columuns with key
2006-03-20 16:28:25 +04:00
Ad file "have_ndb_status_ok.require"
2006-04-24 13:25:50 +02:00
Bug#8191 - SELECT INTO OUTFILE insists on FROM clause
2005-05-08 22:56:58 +01:00
Bug#20145 perror segfault when call it with error nr
2006-07-24 18:05:00 +02:00
Bug#18564 Test failure due to test not checking preconditions
2006-04-12 15:13:16 +02:00
Add test to mysql-test-run.pl to see if the udf_example.so is availble. Set envioronment variable UDF_EXAMPLE_LIB if it is.
2006-04-27 16:32:40 +02:00
Fixed bug #19573 .
2006-05-16 22:19:44 -07:00
BUG#18233 - Memory tables INDEX USING HASH (a,b) returns 1 row on
2006-05-10 21:50:04 +05:00
Merge updates.
2006-08-10 12:39:18 -04:00
Fixed bug #21698 : erroneously a field could be replaced by an
2006-09-07 11:06:37 -07:00
Enable warnings for 'no default' fields being set to default when they
2005-01-14 17:09:35 -08:00
Fix for BUG#20716: SHOW INSTANCES statement causes races in IM tests.
2006-07-20 13:24:12 +04:00
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
2006-08-03 16:54:06 +02:00
Fix for BUG#20716: SHOW INSTANCES statement causes races in IM tests.
2006-07-20 13:24:12 +04:00
Fix for BUG#20716: SHOW INSTANCES statement causes races in IM tests.
2006-07-20 13:24:12 +04:00
Fix for BUG#20716: SHOW INSTANCES statement causes races in IM tests.
2006-07-20 13:24:12 +04:00
BUG#17314: Can't use index_merge/intersection for MERGE tables
2006-02-11 21:51:43 +03:00
BUG#19021, Crash in ROR-index_merge optimizer:
2006-04-13 16:05:32 +04:00
concurrent-insert can now be set to 2 for concurrent inserts when there is holes in the data file
2005-05-13 12:08:08 +03:00
Fix for BUG#8579 (failing test case): Allow small differences in #rows estimate in test results
2005-02-22 18:30:44 +03:00
Fixed bug #5500 : EXPLAIN returned a wrong select_type for queries using views.
2006-09-06 08:21:43 -07:00
Bug#18474 Unlistable directories yield no info from information_schema, part2
2006-05-04 17:47:25 +02:00
result fix
2006-08-08 12:50:05 +05:00
Review of code pushed since last 5.0 pull:
2005-10-06 17:54:43 +03:00
A fix and a test case for Bug#17843 "Certain stored procedures fail to
2006-07-04 23:46:15 +04:00
A fix and a test case for Bug#17843 "Certain stored procedures fail to
2006-07-04 23:46:15 +04:00
Moved some old test and added a new test to only be run with mysql-test-run --big
2005-04-07 19:24:14 +03:00
Small fixes done while reviewing pushed code
2005-04-06 16:52:41 +03:00
Fixed bug#12185: Data type aggregation may produce wrong result
2006-07-22 02:08:00 +04:00
BUG#6883: Added implicit commit for CREATE TABLE, TRUNCATE TABLE and DROP/CREATE DATABASE
2005-05-27 04:17:33 +02:00
Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table.
2005-10-26 13:55:08 -07:00
bug#5373: handler READ NEXT w/o HANDLER READ [FIRST]
2005-06-07 22:43:25 +02:00
Merge bug #16792 4.1->5.0
2006-09-05 19:07:55 +03:00
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +02:00
Changes from the innodb-5.0-ss115 snapshot.
2006-01-16 14:32:43 +03:00
BUG#14770 - LOAD DATA INFILE doesn't respect default values for
2006-08-02 17:15:50 +05:00
Cleanup tests and results after merge from 4.1 of embedded
2005-04-04 12:43:58 -07:00
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
2006-08-14 21:27:36 -07:00
Merge xiphis.org:/usr/home/antony/work2/p2-bug10109.3
2005-08-10 22:17:53 +01:00
Post-review fixes, mainly fixing all print() methods for sp_instr* classes.
2005-11-18 16:30:27 +01:00
Bug #15355 : Common natural join column not resolved in prepared statement nested
2006-06-08 13:34:03 +03:00
Implementation of WL#2486 -
2005-08-12 17:57:19 +03:00
Fixed bug #18279 : crash in the cases when on conditions are moved
2006-03-29 16:45:29 -08:00
Fixed bug #16081 : row equalities were not taken into
2006-09-01 04:23:04 -07:00
BUG#14770 - LOAD DATA INFILE doesn't respect default values for
2006-08-02 17:15:50 +05:00
Post-merge fixes
2006-05-31 22:55:45 -07:00
after merge
2006-03-06 23:43:47 +01:00
Merge
2005-04-05 19:45:34 -07:00
Reverting yesterday's patch. (cmiller:1.2099)
2006-03-29 10:56:11 -05:00
Merge mysql.com:/home/mydev/mysql-4.1-bug5390
2006-02-06 15:15:44 +01:00
Bug#16986 - Deadlock condition with MyISAM tables
2006-06-26 19:14:35 +02:00
Bugs#17647: Trouble with "create database"
2006-05-04 11:55:09 +05:00
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-31 19:12:16 -07:00
Bug#17661 information_schema.SCHEMATA returns uppercase with lower_case_table_names = 1
2006-06-06 11:25:31 +05:00
Fix for bug#8156:information_schema and lowercase_table3 fail on OSX
2005-02-14 18:23:10 +03:00
Clean up merge from 4.1, including making several enum fields
2005-02-17 18:07:14 -08:00
postmerge fix
2005-09-14 12:24:14 +03:00
Merge bk-internal:/home/bk/mysql-5.0-engines
2006-07-18 10:25:04 -07:00
Bug#17048 CREATE TABLE ... SELECT truncate values
2006-05-13 13:13:05 +05:00
BUG#14157: utf8 encoding in binlog without set character_set_client e.g DROP temporary
2006-05-09 23:01:31 +03:00
Review of code pushed since last 5.0 pull:
2005-10-06 17:54:43 +03:00
item_cmpfunc.cc, func_in.result, multi_update.result:
2006-05-30 23:05:34 +04:00
Fix test results to be vardir-independent.
2006-07-10 16:22:42 +04:00
Bug#20328 mysql client: dumb about trailing spaces on 'help' command
2006-08-16 17:03:41 +02:00
WL#2930
2005-12-06 21:28:13 +01:00
BUG#14157: utf8 encoding in binlog without set character_set_client
2006-05-31 12:51:21 +02:00
BUG#16217 forced to introduce a separate mysql client command to adopt its
2006-02-09 16:23:09 +02:00
Bug #16502 : mysqlcheck gets confused with views
2006-07-24 13:31:20 -07:00
4.1 -> 5.0 merge fixes
2006-07-14 05:56:30 -07:00
Fix a test case (proper clean up).
2006-08-14 19:18:33 +04:00
Bug #19147 : mysqlshow INFORMATION_SCHEMA does not work
2006-07-21 20:29:25 -07:00
Bug#19890 mysqltest: "query" command is broken
2006-07-26 14:02:24 +02:00
ndb - bug#14509, part 1: move autoincr pre-fetch from Ndb to local dict cache
2006-05-08 15:19:17 +02:00
Bug #13228 open table cache not flushed when table schema changed
2006-01-10 11:35:21 +01:00
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 17:00:50 -07:00
Bug #16875 , correction of previous patch
2006-05-15 17:16:21 +02:00
perror returns 2 if it does not understand the option --ndb
2006-07-31 13:11:21 +02:00
Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code
2006-04-20 12:06:22 +02:00
ndb - bug#19956 (occurs only in v5.0)
2006-05-21 11:04:57 +02:00
Merge of query cache from 4.1 to 5.0
2005-02-04 10:56:53 +01:00
WL#2269 Enable query cache for NDB part 2
2005-03-15 15:03:25 +01:00
Added test case for multiple MySQL Servers connected to one cluster
2004-12-15 12:09:19 +01:00
Bug#16795 ndb_cache_multi2
2006-02-27 10:29:55 +01:00
ndb - bug#14007 5.0 *** does not automerge into 5.1 ***
2005-11-16 13:26:26 +01:00
ndb_condition_pushdown.result:
2006-08-17 18:50:53 +04:00
postt review fixes
2005-10-12 15:19:51 +02:00
Fix for Bug #9318 drop database does not drop ndb tables
2005-04-22 15:28:23 +02:00
Bug #20820 auto inc table not handled correctly when restored from cluster backup
2006-07-06 18:50:44 +02:00
Change in gis test to allow NDB to be able to call generic tests. Fix for Archive so that ALTER TABLE doesn't issue a warning. Also added test case for alter table.
2005-10-26 13:55:08 -07:00
ndb - fix ha_ndb crash on ordered index on nullable varchar
2005-09-01 14:12:48 +02:00
ndb - bug#15918 fix
2006-02-07 19:57:31 +01:00
Added tests with IGNORE and NULL values
2006-03-28 10:01:23 +02:00
Change from std_data to std_data_ln
2006-02-14 17:15:24 +01:00
Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL
2006-06-14 20:16:32 +02:00
Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1
2006-08-15 13:37:39 +02:00
Fix to make ndb_multi.test (Bug #15401 NDB lock problems) more predictable
2005-12-14 16:29:56 +01:00
ndb - bug#17729 bug#18406
2006-03-28 14:38:16 +02:00
Bug#16997 Table rename that changes database does not rename indexes, recreate indexes in new database
2006-05-05 17:18:47 +02:00
Fix for bug#18437 "Wrong values inserted with a before update trigger on
2006-07-02 01:51:10 +04:00
Bug #20820 auto inc table not handled correctly when restored from cluster backup
2006-07-06 18:50:44 +02:00
bug#11205 - ndb - 4006 when starting scan
2005-06-09 15:39:14 +02:00
Fix for bug#18437 "Wrong values inserted with a before update trigger on
2006-07-02 01:51:10 +04:00
Bug #18864 TRUNCATE TABLE doesn't reset AUTO_INCREMENT value on ndb table
2006-06-02 07:26:45 +02:00
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05:00
Re-generated
2005-04-21 10:59:21 +02:00
Bug#17002 mysql-test-run as root user
2006-04-24 10:21:09 +02:00
Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures".
2005-09-03 03:13:18 +04:00
BUG#10589: des_encrypt functionality always return NULL
2005-06-17 18:07:46 +02:00
BUG#14770 - LOAD DATA INFILE doesn't respect default values for
2006-08-02 17:15:50 +05:00
BUG#14770 - LOAD DATA INFILE doesn't respect default values for
2006-08-02 17:15:50 +05:00
Merge macbook.gmz:/Users/kgeorge/mysql/work/B14553-4.1-opt
2006-07-10 16:44:05 +03:00
Fixed bug #5500 : EXPLAIN returned a wrong select_type for queries using views.
2006-09-06 08:21:43 -07:00
Bug#20411: "GRANT ... REQUIRE ISSUER nnn AND SUBJECT mmm" fails to require both
2006-08-22 14:29:48 +02:00
Bug #21302 : Result not properly sorted when using an ORDER BY on a second table in a join
2006-08-15 15:48:49 +03:00
merge fixies BUG#10418 4.1 -> 5.0
2006-05-12 12:31:22 +02:00
Change error code to test for "unknown error" with to 10000
2006-08-01 11:29:10 +02:00
Post-merge fixes
2006-05-31 22:55:45 -07:00
A post-merge fix.
2006-08-02 19:39:47 +04:00
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
2006-08-02 16:48:17 +04:00
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
2006-08-14 21:27:36 -07:00
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
2006-08-14 21:27:36 -07:00
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
2006-08-14 21:27:36 -07:00
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
2006-08-14 21:27:36 -07:00
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
2006-08-14 21:27:36 -07:00
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
2006-08-14 21:27:36 -07:00
BUG#18492: mysqld reports ER_ILLEGAL_REFERENCE in --ps-protocol
2006-04-28 11:23:31 +02:00
Bug#14406 GRANTS ON objects with non-ascii names borked after FLUSH PRIVILEGES
2005-11-14 16:36:06 +04:00
Fixed bug #16249 : different results for a range with an without index
2006-08-31 07:27:34 -07:00
We should prohobit concurent read of inserting file in SP
2006-03-15 19:15:52 +02:00
Fixed bug #5500 : EXPLAIN returned a wrong select_type for queries using views.
2006-09-06 08:21:43 -07:00
Add new option "check-testcases" to mysql-test-run.pl
2006-01-26 17:54:34 +01:00
Merge may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-4.1
2006-08-14 18:08:33 +05:00
Fixed bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.
2006-06-07 16:17:56 +04:00
Fixed bug #16081 : row equalities were not taken into
2006-09-01 04:23:04 -07:00
BUG#13484: In ha_innobase::cmp_ref call Field::key_cmp() as this is the function
2005-10-01 11:56:01 +04:00
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
2006-01-27 10:49:07 +01:00
Make it possible to run mysql-test-run.pl with default test suite in different vardir.
2006-01-24 08:30:54 +01:00
Fix for bug #7100 : relay_log_space_max missing from SHOW VARIABLES
2005-03-16 15:57:57 +03:00
Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
2004-12-10 12:07:11 +03:00
WL#874 "Extended LOAD DATA".
2005-03-16 04:32:47 +03:00
Add new option "check-testcases" to mysql-test-run.pl
2006-01-26 17:54:34 +01:00
Fix for BUG#20524 "auto_increment_* not observed when inserting
2006-07-06 14:37:09 +02:00
rpl_auto_increment_11932.test, rpl_auto_increment_11932.result:
2006-05-22 12:18:18 +09:30
WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.
2005-03-25 14:51:17 +01:00
BUG#16217 forced to introduce a separate mysql client command to adopt its
2006-02-09 16:23:09 +02:00
Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
2004-12-10 12:07:11 +03:00
Implementation of WL#2897: Complete definer support in the stored routines.
2006-03-02 15:18:49 +03:00
Post merge correction for the Changesset
2006-04-20 19:43:02 +02:00
fixed test after merge
2005-08-19 11:38:14 +03:00
Review fixes
2005-08-24 19:37:27 +03:00
Fixed compiler warnings
2005-07-28 21:25:05 +03:00
Fix for BUG#13023: "SQL Thread is up but doesn't move forward". Details in slave.cc;
2005-10-12 13:29:55 +02:00
Generate warning in ha_delete_table() if files is missing in handler
2005-02-21 20:41:48 +02:00
WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.
2005-03-25 14:51:17 +01:00
Add new option "check-testcases" to mysql-test-run.pl
2006-01-26 17:54:34 +01:00
Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
2005-09-01 12:53:23 +02:00
Add new option "check-testcases" to mysql-test-run.pl
2006-01-26 17:54:34 +01:00
Bug#17203: "sql_no_cache sql_cache" in views created from prepared statement
2006-06-27 21:28:32 +04:00
Add new option "check-testcases" to mysql-test-run.pl
2006-01-26 17:54:34 +01:00
BUG#15699 importing the fix from 5.0
2006-01-26 12:49:55 +02:00
Make it possible to run mysql-test-run.pl with default test suite in different vardir.
2006-01-24 08:30:54 +01:00
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
2006-07-13 18:16:16 +04:00
A .test for BUG#6287 "Slave skips auto_increment values in Replication with InnoDB"
2004-12-16 23:14:41 +01:00
Added a test case for BUG#10456
2005-08-02 15:13:56 -06:00
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
2006-01-27 10:49:07 +01:00
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
2006-01-27 10:49:07 +01:00
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
2006-01-27 10:49:07 +01:00
Make it possible to run mysql-test-run.pl with default test suite in different vardir.
2006-01-24 08:30:54 +01:00
Manually merged
2006-06-17 02:57:50 +04:00
WL#874 "Extended LOAD DATA".
2005-03-16 04:32:47 +03:00
A test for the BUG#7658 just fixed in 4.0 (could not put it into 4.0 as in 4.0 we don't replicate OPTIMIZE TABLE).
2005-01-10 15:13:33 +01:00
Bug#17203: "sql_no_cache sql_cache" in views created from prepared statement
2006-06-27 21:28:32 +04:00
WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.
2005-03-25 14:51:17 +01:00
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
2006-01-27 10:49:07 +01:00
Fix fur BUG#13348: "multi-table updates and deletes are not logged if no rows were affected".
2005-09-20 17:41:47 +02:00
fix for BUG#11139 (multi-delete with alias breaking replication if table rules are
2005-09-14 06:31:38 -06:00
WL#874 "Extended LOAD DATA".
2005-03-16 04:32:47 +03:00
Fix fur BUG#13348: "multi-table updates and deletes are not logged if no rows were affected".
2005-09-20 17:41:47 +02:00
- set 'updating' in both tables list if we have two of them (because of subquery) (BUG#13236)
2005-10-14 00:02:38 +03:00
Add new option "check-testcases" to mysql-test-run.pl
2006-01-26 17:54:34 +01:00
BUG#15699 importing the fix from 5.0
2006-01-26 12:49:55 +02:00
Cleanup test cases that leaves "stuff" behind
2006-04-18 18:10:47 +02:00
Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to
2006-04-13 20:42:48 +02:00
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
2006-01-27 10:49:07 +01:00
WL#874 "Extended LOAD DATA".
2005-03-16 04:32:47 +03:00
Make it possible to run mysql-test-run.pl with default test suite in different vardir.
2006-01-24 08:30:54 +01:00
After-merge fixes.
2005-07-19 03:01:25 +04:00
WL#874 "Extended LOAD DATA".
2005-03-16 04:32:47 +03:00
WL#874 "Extended LOAD DATA".
2005-03-16 04:32:47 +03:00
Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902 )
2005-04-01 15:04:50 +03:00
Add new option "check-testcases" to mysql-test-run.pl
2006-01-26 17:54:34 +01:00
Add new option "check-testcases" to mysql-test-run.pl
2006-01-26 17:54:34 +01:00
Fix for BUG#20438: CREATE statements for views, stored routines and triggers
2006-07-28 02:49:18 +04:00
Fix for BUG#12637: Make SPs+user variables replication work:
2005-09-07 19:39:47 +04:00
Fixed result file (rpl_temporary)
2006-05-16 09:26:57 +02:00
BUG#16217 forced to introduce a separate mysql client command to adopt its
2006-02-09 16:23:09 +02:00
Fix for BUG#20438: CREATE statements for views, stored routines and triggers
2006-07-28 02:49:18 +04:00
Bug#17137 Running "truncate table" on temporary table leaves the table open on a slave
2006-03-08 10:15:48 +01:00
Bug#15886 (Test: Timing issue in test "rpl_until"):
2006-05-11 16:29:02 +02:00
Bug#19136: Crashing log-bin and uninitialized user variables in a derived table
2006-05-07 19:54:57 +03:00
A fix (bug #10703 : rpl_variables.test failure).
2005-05-18 15:10:43 +05:00
Fix for BUG#20438: CREATE statements for views, stored routines and triggers
2006-07-28 02:49:18 +04:00
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
Fixed bug #21390 : wrong estimate of rows after elimination of
2006-08-25 02:17:41 -07:00
Merge
2005-03-01 14:50:59 +02:00
Fix bug #11864 non unique names are allowed in subquery
2005-08-10 17:45:00 +04:00
Added test case for multiple MySQL Servers connected to one cluster
2004-12-15 12:09:19 +01:00
Added test case for multiple MySQL Servers connected to one cluster
2004-12-15 12:09:19 +01:00
Bug#16581: deadlock: server and client both read from connection in
2006-07-28 15:06:23 +04:00
Additional fix for BUG#16777: Can not create trigger nor view
2006-03-10 14:40:15 +03:00
skip_name_resolve.result, skip_name_resolve.test:
2005-12-12 16:58:20 +01:00
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
Bug#19207: Final parenthesis omitted for CREATE INDEX in Stored Procedure
2006-07-07 21:24:54 +04:00
Fixed BUG#16303: erroneus stored procedures and functions should be droppable
2006-01-26 13:29:46 +01:00
A fix and a test case for Bug#19308 "REPAIR/OPTIMIZE/ANALYZE
2006-04-25 04:27:23 +04:00
BUG#14702: misleading error message when syntax error in
2006-07-24 15:10:50 +04:00
Fix for bug#19634 "Re-execution of multi-delete which involve trigger/stored
2006-06-21 01:50:20 +04:00
Bug#18630: Arguments of suid routine calculated in wrong security
2006-07-13 17:12:31 +04:00
BUG#12228: Post review fixes: Added test case, code cleanup.
2005-08-10 21:17:02 +00:00
Bug#17226: Variable set in cursor on first iteration is assigned
2006-06-30 18:14:22 +04:00
Fixed bug #21493 : crash for the second execution of a function
2006-09-16 09:50:48 -07:00
Bug#15298 SHOW GRANTS FOR CURRENT_USER: Incorrect output in DEFINER context
2006-06-29 15:50:44 +05:00
Bug#10656 Stored Procedure - Create index and Truncate table command error
2006-03-09 12:08:23 +01:00
sql_mode.test:
2006-04-27 21:59:04 +09:30
Post-merge fixes
2006-06-01 16:51:19 -07:00
Post-merge fixes
2006-06-01 16:51:19 -07:00
In test for bug#15933 we have to wait for all disconnects to finish to avoid
2006-04-12 17:37:57 +04:00
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
2006-08-14 21:27:36 -07:00
Merge macbook.gmz:/Users/kgeorge/mysql/work/B16792-4.1-opt
2006-09-05 17:09:12 +03:00
Merge macbook.gmz:/Users/kgeorge/mysql/work/B20792-4.1-opt
2006-07-26 19:23:44 +03:00
Add new option "check-testcases" to mysql-test-run.pl
2006-01-26 17:54:34 +01:00
Fixes to embedded server to be able to run tests with it
2006-02-24 18:34:15 +02:00
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
Moved some old test and added a new test to only be run with mysql-test-run --big
2005-04-07 19:24:14 +03:00
Merge
2006-06-30 02:03:09 +04:00
Better handling of ensuring that setup_tables() are not called twice
2005-01-03 21:04:33 +02:00
Post-merge fixes
2006-06-09 19:29:39 -07:00
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05:00
Review of code pushed since last 5.0 pull:
2005-10-06 17:54:43 +03:00
WL#1420 convert NIST test for mysql
2005-01-26 10:19:28 +01:00
Fix for bug#11081 "Using a CONVERT_TZ function in a stored function or
2006-04-24 18:57:00 +04:00
Fix for bug#15153 "CONVERT_TZ() is not allowed in all places in VIEWs".
2006-04-22 11:54:25 +04:00
Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases
2006-01-27 10:49:07 +01:00
Bug#14635: Accept NEW.x as INOUT parameters to stored procedures
2006-05-12 13:55:21 +04:00
Fix for bug #18153 "ALTER/OPTIMIZE/REPAIR on transactional tables corrupt
2006-03-24 14:58:18 +03:00
Merge mysql.com:/home/tomash/src/mysql_ab/mysql-5.0
2006-06-28 23:54:18 +04:00
Merge mysql.com:/home/jimw/my/mysql-5.0-14299
2005-12-06 14:16:34 -08:00
Bug #13601 : Wrong int type for bit
2006-04-04 17:54:58 -07:00
Bug #13601 : Wrong int type for bit
2006-04-04 17:54:58 -07:00
Bug #19498 : Inconsistent support for DEFAULT in TEXT columns
2006-07-18 16:04:18 -07:00
Update test result
2005-02-05 08:54:13 -08:00
Fixed bug#21475: Wrongly applied constant propagation leads to a false comparison.
2006-08-21 00:23:57 +04:00
Fix for bug#17826 'type_decimal' fails with ps-protocol
2006-03-03 15:29:39 +04:00
a fix (bug #6267 : ENUM ... NOT NULL w/o default treated differently than other data types).
2005-05-13 16:44:14 +05:00
Bug#17048 CREATE TABLE ... SELECT truncate values
2006-05-13 13:13:05 +05:00
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
Bug#16172 DECIMAL data type processed incorrectly
2006-08-08 14:40:07 +05:00
bug #20910 (NOT NULL column reported as NULL in SHOW FIELDS)
2006-08-10 14:50:54 +05:00
merge with 4.1
2005-02-28 12:18:39 +02:00
Merge mysql.com:/home/alexi/dev/mysql-4.1-15805
2006-01-10 19:22:47 +03:00
bug #20910 (NOT NULL reported as NULL for TIMESTAMP)
2006-08-08 13:34:27 +05:00
Fix for BUG#15588: String overrun during sp-vars.test
2006-01-20 15:59:22 +03:00
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2006-08-02 21:54:10 +04:00
Merge bug #16792 4.1->5.0
2006-09-05 19:07:55 +03:00
Merge mysql.com:/opt/local/work/mysql-4.1-root
2006-02-02 18:17:18 +03:00
Update test results
2005-05-02 11:45:06 -07:00
BUG#16217 forced to introduce a separate mysql client command to adopt its
2006-02-09 16:23:09 +02:00
Fixed bug#16861: User defined variable can have a wrong value if a tmp table was
2006-08-22 17:37:41 +04:00
Fixed bug #16504 .
2006-03-31 21:26:17 -08:00
Merge mysql.com:/opt/local/work/mysql-5.0-release
2006-06-29 15:25:03 +04:00
Fixed bug #5500 : EXPLAIN returned a wrong select_type for queries using views.
2006-09-06 08:21:43 -07:00
Fixed bug #5500 : EXPLAIN returned a wrong select_type for queries using views.
2006-09-06 08:21:43 -07:00
We should not skip temptable view along with other derived
2005-12-01 12:01:38 +02:00
BUG#19951: Race conditions in test wait_timeout.
2006-07-06 23:49:09 +02:00
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
2006-08-14 21:27:36 -07:00
Fix handling of filenames that start the same as reserved filenames
2005-08-31 18:32:15 -07:00
Bug#12935 Local and XA transactions not mutually exclusive
2005-10-05 19:58:16 +02:00
58e178c5cc