Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-06-27 13:12:10 +02:00
Merge abarkov@bk-internal:/home/bk/mysql-5.0
2005-10-13 19:19:05 +05:00
Merged from 4.1
2005-09-11 22:10:04 +03:00
Bug #10901
2005-06-03 17:13:43 +02:00
Merge mysql.com:/home/psergey/mysql-4.1-bug8510
2005-03-15 09:29:54 +03:00
Per a user request there is now support for "CHECK TABLE" where the table is an archive file.
2005-10-18 14:52:38 -07:00
Ensure that we reset auto-increment cache if we have to do an UPDATE becasue of REPLACE
2005-06-06 20:41:52 +03:00
Show all generated warnings in SHOW ERROR
2005-02-24 23:33:42 +02:00
fix for bug #14381
2005-11-01 19:37:59 +01:00
fix test results - Bug #11328
2005-06-16 10:09:05 +02:00
Added option --valgrind-mysqltest to mysql-test-run
2005-09-14 01:41:44 +03:00
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05:00
Fixed binlog.test failure which occured after patch implementing
2005-03-16 23:12:27 +03:00
Approximative fixes for BUG#2610,2611,9100 i.e. WL#2146 binlogging/replication of routines (stored procs and functions).
2005-05-05 14:20:53 +02:00
Change sql_mode BROKEN_NOT to HIGH_NOT_PRECEDENCE
2004-11-27 19:26:46 +00:00
Fixed BUG#12589: Assert when creating temp. table from decimal stored
2005-09-27 17:07:28 +02:00
Merged from 4.1.
2005-10-13 19:34:15 +03: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
Proper fix for comparision with ' '
2005-02-01 16:27:08 +02:00
Merge 4.1->5.0
2005-09-09 10:54:59 +04: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
Merged from 4.1 to 5.0.
2005-09-13 01:44:50 +03:00
Bug#12476 Some big5 codes are still missing.
2005-10-05 19:20:49 +05:00
merge
2005-04-11 15:11:52 +05:00
Bug#12547: Inserting long string into varchar causes table crash in cp932
2005-10-11 12:09:38 +05:00
ctype_cp1250_ch.result, ctype_cp1250_ch.test:
2005-06-06 21:22:23 +05:00
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05:00
Syntax extention: 'ALTER DATABASE' without db name (after review)
2004-12-06 19:01:51 +03:00
Fixed the ucs2 -> eucjpms conversion bug (bug#11717)
2005-07-18 13:38:56 -07:00
Bug#13046: LIKE pattern matching using prefix
2005-09-21 23:10:51 +05:00
Merge mysql.com:/usr/home/bar/mysql-4.1.b13145
2005-10-14 13:57:38 +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
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
Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
2004-12-10 12:07:11 +03:00
Bug#13046: LIKE pattern matching using prefix
2005-09-21 23:10:51 +05:00
Merge msdesk.(none):/home/msvensson/mysql-4.1
2005-10-06 14:40:18 +02:00
Merge msdesk.(none):/home/msvensson/mysql-4.1
2005-10-06 14:40:18 +02:00
Merge msdesk.(none):/home/msvensson/mysql-4.1
2005-10-06 14:40:18 +02:00
Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle.
2005-09-30 10:58:24 +02:00
Merge msdesk.(none):/home/msvensson/mysql-4.1
2005-10-06 14:40:18 +02:00
ctype_utf8.result:
2005-10-21 16:58:10 +05:00
Fix bug #11760 Typo in Item_func_add_time::print() results in NULLs returned
2005-07-20 06:55:51 +04:00
test case fixed to pass w/o innodb
2005-09-25 15:44:05 +02:00
Fix crash in 'INSERT DELAYED' statement that failed due to a
2005-08-01 17:00:03 -07:00
Fixed bug in multiple-table-delete where some rows was not deleted
2005-05-30 20:48:40 +03:00
Bug#10586
2005-09-08 18:15:05 +01:00
bad merge fixed
2005-09-15 21:05:42 +02:00
Fixed core dump bug when hot link list in key cache was empty. Bug #10167
2005-04-27 14:31:04 +03:00
Last part of fix for BUG#7998 "Replication should be more clever about when to replicate RELEASE_LOCK()" + fixes after merge
2005-03-02 17:52:38 +01: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 abarkov@bk-internal:/home/bk/mysql-5.0
2005-10-13 19:19:05 +05: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
Merge mysql.com:/home/mydev/mysql-4.1-4100
2005-08-08 00:10:07 +02:00
mysql-test/r/flush_block_commit.result
2005-04-12 23:08:19 +02:00
Making FLUSH TABLES WITH READ LOCK killable while it's waiting for running commits to finish. Normally this step is not long but it's still nice to be killable
2004-12-02 23:02:38 +01:00
Fix bug #11934 Two sequential FLUSH TABLES WITH READ LOCK hangs client
2005-08-03 02:01:27 +04:00
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
Windows compatibility changes of the 'rpl_delete_all',
2005-02-17 02:59:39 +01:00
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-08-12 19:27:54 +03:00
fulltext_var.result:
2005-08-29 22:35:48 -05:00
skip last compress test if we're short of RAM
2004-11-28 16:31:14 +01:00
After merge fixes
2005-01-04 13:46:53 +02: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
Precision Math implementation
2005-02-09 02:50:45 +04:00
Merge 4.1->5.0
2005-09-09 10:54:59 +04:00
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-23 09:18:56 +02:00
Manual merge
2005-06-13 11:45:29 -07:00
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05:00
Merge mysql.com:/usr/home/bar/mysql-4.1.b12611
2005-09-07 16:32:15 +05:00
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-09-06 20:51:15 +03:00
Fix cases where SLEEP() calls would get optimized away or cached. (Bug #12689 )
2005-08-19 15:51:40 -07:00
Tests and results fixed with last precision/decimal related modifications
2005-05-06 01:01:39 +05:00
Fixed test results after merging fix for bug #8068 "TIMEDIFF with first
2005-04-18 15:58:58 +04:00
Fixed BUILD script to use --with-berkeley-db instead of --with-bdb
2005-02-19 18:58:27 +02:00
Reviewing new pushed code
2005-10-12 00:58:22 +03:00
Merge mysql.com:/usr/home/bar/mysql-4.1.b12351
2005-08-12 17:10:00 +05:00
func_str.result, null.result:
2005-08-26 22:25:45 -07:00
Fixed BUG#12963, BUG#13000: wrong VIEW creation with DAYNAME(),
2005-09-14 20:25:00 +04:00
Merge deer.(none):/home/hf/work/mysql-4.1.clean
2005-08-27 18:10:46 +05:00
gis.test corrected with Pem's wishes
2005-08-27 20:06:35 +05:00
grant.result:
2005-08-08 19:04:11 +05:00
Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423
2005-09-01 23:25:29 +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
aftermerge
2005-09-09 12:47:57 +02:00
test case fixed to pass w/o innodb
2005-09-25 15:44:05 +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
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
ctype-gbk.c:
2005-07-22 21:06:02 +05:00
openssl_1.result, have_openssl_1.require, openssl_1.test:
2004-12-01 02:35:02 +01:00
Bug#8191 - SELECT INTO OUTFILE insists on FROM clause
2005-05-08 22:56:58 +01:00
Fix for BUG#11211 "GROUP BY doesn't work correctly"
2005-06-15 10:12:49 +03:00
Fix for BUG#13455: Make "ref" optimizer able to make this inference:
2005-09-30 01:34:19 +04:00
BUG#8924 'Explain' shows different strategy
2005-04-12 12:04:43 +02:00
Bug#10178 - failure to find a row in heap table by concurrent UPDATEs
2005-06-24 19:47:19 +02:00
Enable warnings for 'no default' fields being set to default when they
2005-01-14 17:09:35 -08:00
WL#2789 "Instance Manager: test using mysql-test-run testing framework"
2005-10-01 01:14:50 +04:00
fix for im_life_cycle test: replace im instance port number with a constant string.
2005-10-18 00:48:34 +04:00
WL#2789 "Instance Manager: test using mysql-test-run testing framework"
2005-10-01 01:14:50 +04:00
WL#2789 "Instance Manager: test using mysql-test-run testing framework"
2005-10-01 01:14:50 +04:00
WL#2789 "Instance Manager: test using mysql-test-run testing framework"
2005-10-01 01:14:50 +04:00
Fix for BUG#10804: allow differences in rows field in EXPLAIN output
2005-06-20 11:05:38 +02: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
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
fix for bug#14089 FROM list subquery always fails when
2005-10-21 13:14:54 +05:00
fix for bug #12315 - SHOW TABLE STATUS FROM information_schema; does not sort tablenames
2005-08-05 11:01:29 +02:00
Review of code pushed since last 5.0 pull:
2005-10-06 17:54:43 +03:00
Enlarged group item key_length by a varstring length field.
2004-12-16 11:41:52 +01: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
BUG#14056 Column prefix index on UTF-8 primary key column causes 'Can't find record..'
2005-10-19 12:06:29 -04:00
BUG#6883: Added implicit commit for CREATE TABLE, TRUNCATE TABLE and DROP/CREATE DATABASE
2005-05-27 04:17:33 +02:00
bug#5373: handler READ NEXT w/o HANDLER READ [FIRST]
2005-06-07 22:43:25 +02:00
Cleanup tests and results after merge from 4.1 of embedded
2005-04-04 12:43:58 -07:00
bad merge fixed
2005-09-15 21:05:42 +02:00
Merge xiphis.org:/usr/home/antony/work2/p2-bug10109.3
2005-08-10 22:17:53 +01:00
WL#2486 - natural and using join according to SQL:2003
2005-08-23 18:08:04 +03:00
Implementation of WL#2486 -
2005-08-12 17:57:19 +03:00
fix for bug #13545 : Server crash caused by select query.
2005-09-29 19:34:21 +05:00
join_outer.result, opt_range.cc, item_cmpfunc.cc:
2005-09-07 17:42:47 +04:00
After merge fix.
2005-08-29 21:06:45 +02:00
Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO
2005-08-07 20:39:17 +02:00
backport kill.test fix from 5.0
2005-04-11 22:36:07 +02:00
Merge
2005-04-05 19:45:34 -07:00
Merge from 4.1 to 5.0
2005-09-23 14:37:22 +02:00
Merge
2005-05-24 15:52:48 +01:00
BUG#9998 MySQL client hangs on "USE database"
2005-06-03 15:29:05 +02:00
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
2005-08-31 19:12:16 -07:00
lowercase_table2.test, lowercase_table2.result:
2005-07-05 17:27:37 +02: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 mysql.com:/home/mydev/mysql-4.1-4100
2005-09-29 14:07:32 +02:00
Fixed BUG#12589: Assert when creating temp. table from decimal stored
2005-09-27 17:07:28 +02:00
Cleanup tests and results after merge from 4.1 of embedded
2005-04-04 12:43:58 -07:00
Review of code pushed since last 5.0 pull:
2005-10-06 17:54:43 +03:00
Implementation of WL#2486 -
2005-08-12 17:57:19 +03:00
Fix for BUG#13455: Make "ref" optimizer able to make this inference:
2005-09-30 01:34:19 +04:00
Review of code pushed since last 5.0 pull:
2005-10-06 17:54:43 +03:00
Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle.
2005-09-30 10:58:24 +02:00
Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle.
2005-09-30 10:58:24 +02:00
Fix for bug#13783 mysqlcheck tries to optimize and analyze information_schema
2005-10-18 14:25:03 +05:00
select.result, mysqldump-max.result:
2005-10-13 21:28:44 +05:00
BUG# 13146
2005-10-13 13:42:56 -07:00
Review of code pushed since last 5.0 pull:
2005-10-06 17:54:43 +03:00
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-09-30 16:51:35 +02:00
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2005-09-22 09:10:11 +02:00
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 17:00:50 -07:00
BUG#9626 valgrind warnings
2005-05-19 20:38:48 +02:00
enabled mysqldump hex-blob option for bit fields
2005-09-14 15:46:31 +02:00
manually merged
2004-12-31 15:26:24 +01: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
ndb - ndb_multi - reset query cache at end of test
2005-02-21 11:45:51 +01:00
ndb -
2005-01-09 11:00:37 +01:00
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05: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
added check in ndb tests that require "default" cluster running
2005-01-26 14:38:13 +01:00
fixed ndb_grant test
2004-11-26 15:27:45 +00:00
ndb - fix ha_ndb crash on ordered index on nullable varchar
2005-09-01 14:12:48 +02:00
Invalid DEFAULT values for CREATE TABLE now generates errors. (Bug #5902 )
2005-04-01 15:04:50 +03:00
Fix for bug#10936: Cluster engine shows wrong key value for duplicate key error
2005-06-17 14:45:54 +02:00
Fix for avoiding gettin Invalid schema object version when doing local changes
2005-04-27 18:17:41 +02:00
wl#2126 - ndb - Fix handling of null values wrt read multi range
2004-12-01 12:43:30 +01:00
logging_ok:
2005-05-04 10:16:03 +02:00
bug#11205 - ndb - 4006 when starting scan
2005-06-09 15:39:14 +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
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
func_str.result, null.result:
2005-08-26 22:25:45 -07:00
WL#2486 - natural and using join according to SQL:2003
2005-08-23 18:08:04 +03:00
Manual merge
2005-09-15 22:21:30 +04:00
BUG#9521 fix:
2005-04-01 00:03:26 +05:00
WL#2486 - natural and using join according to SQL:2003
2005-08-23 18:08:04 +03:00
After merge fixes
2005-05-14 16:24:36 +03: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 #12651 (item of a prepared query allocated on non-permanent
2005-09-08 21:30:05 +02:00
Final patch for 5.0 for simplifying storage engine code. We now have just one set of ifdefs. I may also remove the code for creating new handlers.
2005-10-03 18:42:30 -07:00
Fixed BUG#12589: Assert when creating temp. table from decimal stored
2005-09-27 17:07:28 +02:00
Fixed BUG#12589: Assert when creating temp. table from decimal stored
2005-09-27 17:07:28 +02:00
Fixed BUG#12589: Assert when creating temp. table from decimal stored
2005-09-27 17:07:28 +02:00
Fixed BUG#12589: Assert when creating temp. table from decimal stored
2005-09-27 17:07:28 +02:00
Fixed BUG#12589: Assert when creating temp. table from decimal stored
2005-09-27 17:07:28 +02:00
Fixed BUG#12589: Assert when creating temp. table from decimal stored
2005-09-27 17:07:28 +02:00
After merge fixes
2005-07-28 21:39:24 +03:00
Bug #13231 mysqltest: fails to dectect when mysql_next_result fails
2005-09-29 10:25:44 +02:00
query_cache_notembedded.test, query_cache_notembedded.result:
2005-08-11 13:07:08 +03:00
select.result, mysqldump-max.result:
2005-10-13 21:28:44 +05:00
Show all generated warnings in SHOW ERROR
2005-02-24 23:33:42 +02:00
remove the rest of isam/merge references
2005-04-05 13:17:49 +02:00
stop on NULL comparison only if it is allowed (BUG#12509)
2005-08-18 12:07:14 +03: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
2005-04-05 19:45:34 -07: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
test made independend of server builtin features
2004-11-21 16:42:54 +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
Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle.
2005-09-30 10:58:24 +02:00
Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
2004-12-10 12:07:11 +03:00
BUG#13343 CREATE|etc TRIGGER|VIEW|USER don't commit the transaction (inconsistency)
2005-10-13 05:12:17 -04:00
Merge mysql.com:/home/bkroot/mysql-4.1
2005-07-13 14:15:23 +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
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
2005-06-01 16:13:24 -07:00
Merge neptunus.(none):/home/msvensson/mysql/bug11316/my41-bug11316
2005-09-01 12:53:23 +02:00
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-10-08 16:56:10 +02:00
Bug#11401: Setting thd->lex so that engines (i.e., InnoDB) recognizes
2005-07-05 13:55:54 +02:00
Fix of an incorrect merge
2005-02-24 17:25:06 +01: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
WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.
2005-03-25 14:51:17 +01: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
WL#874 "Extended LOAD DATA".
2005-03-16 04:32:47 +03: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
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
WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.
2005-03-25 14:51:17 +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
BUG#12618: Removing fake locking
2005-10-10 15:10:14 +02:00
after merge fix
2005-10-07 15:09:44 +05: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 mysql.com:/users/lthalmann/bk/mysql-4.1
2005-09-02 11:01:00 +02:00
WL#874 "Extended LOAD DATA".
2005-03-16 04:32:47 +03:00
Merge
2005-04-06 18:19:05 +02: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
Reverted old fix with sync_slave_with_master and added a replace commands
2005-09-12 10:50:42 +02:00
Temporary solution for bug #13969 "Routines which are replicated from master
2005-10-12 23:42:51 +04:00
Fix for BUG#12637: Make SPs+user variables replication work:
2005-09-07 19:39:47 +04:00
Cleanups during review stage
2004-12-02 14:43:51 +02:00
sql/sql_acl.cc
2005-03-23 19:18:25 +01:00
Tell the user that this ROLLBACK is added by mysqlbinlog (so that he does not wonder if it's present in binlog). This was brought up by Salle - thanks Salle.
2005-09-30 10:58:24 +02:00
Save and clear run context before executing a stored function or trigger and restore it afterwards.
2005-08-15 18:15:12 +03:00
WWe now store the catalog in Query_log_event in binlog WITHOUT its end zero.
2005-03-25 14:51:17 +01:00
WL#874 "Extended LOAD DATA".
2005-03-16 04:32:47 +03:00
A fix (bug #10703 : rpl_variables.test failure).
2005-05-18 15:10:43 +05:00
fixed portability
2005-09-14 23:12:01 +03:00
Don't display 'usage' privilege in TABLE_PRIVILEGES if we have columns privileges
2004-12-10 12:07:11 +03:00
fix for bug #12595 (ESCAPE must be exactly 1 character long)
2005-10-21 04:01:52 +03: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
Merge mysql.com:/usr/home/bar/mysql-4.1
2005-10-21 16:53:50 +05:00
check of ACL initialization in is_acl_user() (BUG#13504)
2005-10-18 21:42:26 +03:00
Fix for bug #13407 "Remote connecting crashes server" and couple of similar
2005-09-22 23:03:53 +04:00
A fix and a test case for Bug#6513 "Test Suite: Values inserted by using
2005-09-22 02:11:21 +04:00
Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures".
2005-09-03 03:13:18 +04:00
A fix and a test case for Bug#13587 "Server crash when SP is created
2005-10-19 14:46:32 +04:00
Disabled the GOTO feature. (It's non-standard and undocumented.)
2005-07-01 15:25:51 +02:00
Prelocking-free SPs, post-review fixes:
2005-08-03 03:37:32 +00:00
sp-security.result, sp.result, sp-security.test, sp.test:
2005-10-16 22:47:19 +04:00
BUG#12228: Post review fixes: Added test case, code cleanup.
2005-08-10 21:17:02 +00:00
Fixed BUG#13941: replace() string fuction behaves badly inside stored
2005-10-19 14:54:54 +02:00
Merge mysql.com:/home/bkroot/mysql-5.0 into mysql.com:/home/bk/mysql-5.0
2005-06-07 16:48:38 +02:00
after merge fix
2005-09-29 17:21:32 +05:00
Added option --valgrind-mysqltest to mysql-test-run
2005-09-14 01:41:44 +03:00
fixes after merge of 4.1.
2005-10-13 00:29:23 +02:00
After merge fixes
2005-10-10 19:38:58 +02:00
A fix and a test case for Bug#12736 "Server crash during a select".
2005-10-13 11:53:00 +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
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
Merged from 4.1
2005-03-03 15:01:46 -08:00
Better handling of ensuring that setup_tables() are not called twice
2005-01-03 21:04:33 +02: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 number to date conversion so it always honors the NO_ZERO_DATE,
2005-07-18 16:12:44 -07:00
Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
2005-07-19 00:55:37 +04:00
Implement WL#2661 "Prepared Statements: Dynamic SQL in Stored Procedures".
2005-09-03 03:13:18 +04:00
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05:00
Fixed problems found by valgrind
2005-09-22 03:23:07 +03:00
Fix error message when creating a non-string field with a display
2005-08-05 17:22:53 -07:00
Move handling of suffix_length from strnxfrm_bin() to filesort to ensure proper sorting of all kind of binary objects
2005-10-14 00:04:52 +03:00
Update test result
2005-02-05 08:54:13 -08:00
fix after merge
2005-08-11 18:42:22 +01:00
duplicate error message removed
2005-09-30 12:01:39 +02: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
Merging
2005-10-11 16:39:35 +05:00
duplicate error message removed
2005-09-30 12:01:39 +02:00
Added option --valgrind-mysqltest to mysql-test-run
2005-09-14 01:41:44 +03:00
merge with 4.1
2005-02-28 12:18:39 +02:00
bug#10466: Datatype "timestamp" displays "YYYYMMDDHHMMSS" irrespective of display sizes.
2005-06-20 12:09:00 +02:00
Update test results. type_varchar changed because the size of the
2005-06-09 21:20:34 -07:00
additional fix for bug #13372 (decimal union)
2005-09-27 16:23:37 +05:00
BUG#121915: Merge 4.1->5.0
2005-10-19 01:52:06 +04:00
Update test results
2005-05-02 11:45:06 -07:00
Reviewing new pushed code
2005-10-12 00:58:22 +03:00
Fix two test results that were merged out-of-order.
2005-08-01 19:21:56 -07:00
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-19 13:47:05 -07:00
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
2005-10-12 00:59:52 +03:00
part 1 (ver 2, postreview fix) of WL#2787
2005-09-14 10:53:09 +03:00
Fix bug #13424 locking view with query cache enabled crashes server
2005-09-26 19:08:26 +04:00
Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how
2005-10-11 09:12:12 -07:00
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-12 20:18:49 +03: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
778088a546