After-merge cleanups to alter_table test
2005-11-30 13:41:40 -08:00
Additional fix for bug #14445 (analyse.test fails)
2005-11-01 16:14:26 +04:00
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-12-01 20:29:48 +03: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
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
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Use transaction-aware DB->stat() call when doing 'ANALYZE TABLE' on
2005-11-07 17:14:35 -08:00
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
2005-12-12 10:11:56 -08: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
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05:00
BUG#15406: Adding support for transactions to blackhole.
2005-12-02 01:11:49 +01:00
Fixed BUG#12589: Assert when creating temp. table from decimal stored
2005-09-27 17:07:28 +02:00
cast.result:
2005-11-21 21:11:28 +04:00
Updated after testing
2005-10-13 11:28:06 +02:00
Merge mysql.com:/M50/bug14720 into mysql.com:/M51/merge-5.1
2005-11-07 22:42:58 +01:00
Fix for bug#11491 Misleading error message if not NULL column set to NULL,
2005-12-01 15:30:11 +04:00
BUG#13406 - incorrect amount of "records deleted" in CSV.
2005-11-17 22:52:31 +01:00
Bug#12476 Some big5 codes are still missing.
2005-10-05 19:20:49 +05:00
Fix for bug #14183 (ctype_cp983.test fails with the embedded server)
2005-11-01 13:18:46 +04:00
Merging
2005-11-03 16:17:11 +04:00
Bug#13347: empty result from query with like and cp1250 charset
2005-10-25 14:49:04 +05:00
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05: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
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05:00
Merge mysql.com:/usr/home/bar/mysql-4.1.b10446
2005-11-29 09:25:51 +04: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
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04: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
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
Bug#14146 CHAR(...USING ...) and CONVERT(CHAR(...) USING...) produce different results
2005-11-07 12:34:19 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
test case fixed to pass w/o innodb
2005-09-25 15:44:05 +02:00
bad merge fixed
2005-09-15 21:05:42 +02:00
Fixes during review of pushed code
2005-10-27 15:15:01 +03:00
Don't use PATH_MAX for FN_REFLEN as this uses too much stack space
2005-11-24 02:36:28 +02:00
Added testcase for BUG#13118
2005-09-16 16:17:44 -07:00
Re-applying the work initially done by Brian, and since worked upon by me previously in several separate patches to the 5.1 parent but never pushed.
2005-11-09 05:53:34 -08:00
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-11-26 20:23:20 +01:00
Handle errors returned by system crypt() in ENCRYPT(). (Bug #13619 )
2005-10-06 16:15:53 -07:00
Merge mysql.com:/home/jimw/my/mysql-4.1-12612
2005-12-01 12:07:25 -08:00
Merge rurik.mysql.com:/home/igor/mysql-5.0
2005-11-22 23:00:57 -08:00
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
2005-09-23 09:18:56 +02:00
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05:00
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-27 18:46:00 -07:00
BUG#9535 Warning for "create table t as select uuid();"
2005-12-07 15:45:31 +01:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
gis.test fixed
2005-11-01 11:43:34 +04:00
grant.result:
2005-11-28 17:06:57 +04:00
Don't use PATH_MAX for FN_REFLEN as this uses too much stack space
2005-11-24 02:36:28 +02:00
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
2005-12-01 09:26:17 +02:00
Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
2005-11-15 21:57:02 +01:00
Fix for BUG#13455: Make "ref" optimizer able to make this inference:
2005-09-30 01:34:19 +04: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
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 mysql.com:/home/gluh/MySQL/Merge/5.0
2005-12-01 11:08:13 +04:00
Review of code pushed since last 5.0 pull:
2005-10-06 17:54:43 +03:00
Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting for
2005-12-13 21:35:24 +03: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
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#11491 Misleading error message if not NULL column set to NULL,
2005-12-01 15:30:11 +04:00
Post-review fixes, mainly fixing all print() methods for sp_instr* classes.
2005-11-18 16:30:27 +01:00
WL#2486 - natural/using join according to SQL:2003
2005-11-30 19:13:29 +02:00
Remove t3 in join_nested.test
2005-11-24 19:51:52 +01:00
Fix for bug#11491 Misleading error message if not NULL column set to NULL,
2005-12-01 15:30:11 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
Fixed BUG#12589: Assert when creating temp. table from decimal stored
2005-09-27 17:07:28 +02:00
Fix mix_innodb_myisam_binlog test and results after merge
2005-11-17 20:17:49 -08:00
Review of code pushed since last 5.0 pull:
2005-10-06 17:54:43 +03:00
Merge mysql.com:/home/mydev/mysql-4.1-4100
2005-11-16 10:23:42 +01: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
WL#2575 - Fulltext: Parser plugin for FTS
2005-11-06 13:13:06 +01:00
select.result, mysqldump-max.result:
2005-10-13 21:28:44 +05:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Review of code pushed since last 5.0 pull:
2005-10-06 17:54:43 +03:00
WORKLOG #2983 Removed --help from test. (did so already, don't know why
2005-12-05 07:50:16 -08:00
Fix for mysqltest.test failing with mysql-test-run.pl and --ps-protocol
2005-12-05 16:00:23 +01:00
Fix for bug#5323, no bug, new error code
2005-11-29 22:54:16 +01:00
Import ndb varsize
2005-11-07 12:19:28 +01:00
Ndb handler cleanup:
2005-11-06 00:20:37 +01:00
Merge mysql.com:/usr/local/bk/mysql-5.0
2005-11-28 20:14:12 +01:00
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
ndb - wl#2624 re-commit due to bk problem
2005-09-15 02:33:28 +02:00
ndb - bug#14007 5.1 (merge 5.0->5.1)
2005-11-20 11:15:13 +01:00
Merge mysql.com:/home/my/mysql-5.0
2005-11-05 01:32:55 +02:00
updated test as result of config change done in cluster startup
2005-11-24 12:36:42 +01:00
Fix of crashed 5.1 tree (wrong merge + wrong pullout patch forced us to create a new 5.1 tree)
2005-11-05 13:20:35 +02:00
ndb - wl#2624 re-commit due to bk problem
2005-09-15 02:33:28 +02:00
Standardised on capital letters for NDBCLUSTER
2005-09-20 22:16:24 -04:00
Ndb handler cleanup:
2005-11-06 00:20:37 +01:00
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
Import ndb varsize
2005-11-07 12:19:28 +01:00
merge
2005-10-06 12:47:40 +02:00
Fixed test case.
2005-12-14 00:23:46 +02:00
Import ndb varsize
2005-11-07 12:19:28 +01:00
type_binary.result, type_binary.test:
2005-10-13 19:16:19 +05:00
Fix for bug#11491 Misleading error message if not NULL column set to NULL,
2005-12-01 15:30:11 +04:00
Fix for bug#11491 Misleading error message if not NULL column set to NULL,
2005-12-01 15:30:11 +04:00
Manual merge
2005-09-15 22:21:30 +04:00
Improved testing of ssl and compression
2005-10-04 15:43:55 +02:00
BUG #14524
2005-11-21 15:21:04 -08:00
Handle default engine type better for
2005-09-20 10:29:59 -04:00
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
2005-12-02 11:57:26 +04:00
Added handlerton flag to make storage engines invisable via flag.
2005-11-10 08:24:21 -08:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Bug#14406 GRANTS ON objects with non-ascii names borked after FLUSH PRIVILEGES
2005-11-14 16:36:06 +04:00
Merge moonbone.local:/work/15028-bug-5.0-mysql
2005-12-02 22:07:10 +03:00
select.result, mysqldump-max.result:
2005-10-13 21:28:44 +05:00
Fix for BUG#14703 "Valgrind error when inserting 0 into a BIT column (like in type_bit.test)":
2005-11-07 16:18:46 +01: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
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
WL#2818 (Add creator to the trigger definition for privilege
2005-11-10 22:25:03 +03:00
Fix for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs
2005-12-05 17:57:48 +01: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
Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-10-08 16:56:10 +02: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 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
Fix for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs
2005-12-05 17:57:48 +01:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
A fix and a test case for Bug#14077 "Failure to replicate a stored
2005-11-17 03:15:10 +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
Fixed BUG #14614 : Replication of tables with trigger generates
2005-12-11 17:06:36 +03:00
rpl_until.test + rpl_until.result Fix (completion) for bug#12429
2005-12-12 18:00:37 +01:00
fixed portability
2005-09-14 23:12:01 +03:00
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
Fix bug #15268 Unchecked null value caused server crash
2005-12-09 23:01:52 +03:00
Merge mysql.com:/home/alik/MySQL/devel/5.0-wl2984
2005-12-09 15:14:19 +03:00
WL#2818 (Add creator to the trigger definition for privilege
2005-11-10 22:25:03 +03:00
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
Removed forgotten test line in sp-code.test.
2005-11-18 18:05:04 +01:00
Fixed BUG#14233: Crash after tampering with the mysql.proc table
2005-11-25 17:09:26 +01:00
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
Fixed sp-error.test result after merging fix for bug #11555 "Stored procedures:
2005-12-07 16:55:16 +03:00
added missing drop view at end of test
2005-11-24 09:56:48 +01:00
sp-security.result, sp.result, sp-security.test, sp.test:
2005-10-16 22:47:19 +04:00
Merge WL#2984
2005-12-12 13:29:48 +03:00
Fix sp.result after merge
2005-12-12 14:53:47 -08:00
Fixed BUG#13729 Stored procedures: packet error after exception handled
2005-11-23 11:56:53 +01:00
Make storage engines "pluggable", handlerton work
2005-11-07 16:25:06 +01:00
Updated after testing
2005-10-13 11:28:06 +02:00
Updated after testing
2005-10-13 11:28:06 +02:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fixed bug #12762 :
2005-10-15 14:32:37 -07:00
After merge fixes
2005-10-10 19:38:58 +02:00
avoiding of calling Item::val_* methods family with opt_range mem_root, because its life time is too short. (BUG#14342)
2005-11-04 13:16:46 +02:00
Patch for WL#2894: Make stored routine variables work
2005-12-07 17:01:17 +03:00
WL#2575 - Fulltext: Parser plugin for FTS
2005-11-06 13:13:06 +01:00
Table definition cache, part 2
2005-11-23 22:45:02 +02:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
WL#2818 (Add creator to the trigger definition for privilege
2005-11-10 22:25:03 +03:00
WL#2818 (Add creator to the trigger definition for privilege
2005-11-10 22:25:03 +03:00
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug7-5.0
2005-11-23 01:28:32 +02:00
Merge mysql.com:/home/jimw/my/mysql-5.0-14299
2005-12-06 14:16:34 -08:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04: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
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Merge WL#2984
2005-12-12 13:29:48 +03:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Fix union.result
2005-11-30 13:10:08 -08:00
Manually merged
2005-12-02 19:42:14 +03:00
Reviewing new pushed code
2005-10-12 00:58:22 +03:00
Reverting patch for BUG #14009 (use of abs() on null value causes problems with filesort
2005-11-01 15:54:30 +02:00
Merge mysql.com:/home/my/mysql-5.1
2005-11-23 22:58:53 +02:00
Merge mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-12-12 14:59:14 +03:00
Clear variable
2005-11-24 06:17:38 +02:00
We should not skip temptable view along with other derived
2005-12-01 12:01:38 +02:00
Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how
2005-10-11 09:12:12 -07:00
Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
2005-12-02 15:01:44 +04:00
Bug#12935 Local and XA transactions not mutually exclusive
2005-10-05 19:58:16 +02:00
