Commit graph

965 commits

Author SHA1 Message Date
monty@narttu.mysql.fi
c21728f8c8 Cleaner implementation if INSERT ... SELECT with same tables
Tests cleanup (put drop database first in tests)
2003-07-03 11:55:36 +03:00
Sinisa@sinisa.nasamreza.org
fb39821e94 Some fixes for CREATE / INSERT FROM UNIO >.. 2003-07-02 01:24:05 +03:00
Sinisa@sinisa.nasamreza.org
b7644c9212 merge changes 2003-07-02 00:26:23 +03:00
Sinisa@sinisa.nasamreza.org
c1660e1a23 Lot's of clean-ups and fixes for 4.0.14. 2003-07-02 00:10:47 +03:00
monty@mashka.mysql.fi
7b34e1c39d Updated results after merge 2003-07-01 15:38:11 +03:00
monty@mashka.mysql.fi
ca2913a07e Merge with 3.23 tree to get latest bug fixes 2003-07-01 15:02:16 +03:00
monty@mashka.mysql.fi
9fb7e863ad Optimized old patches
Don't set field to DEFAULT value when set to NULL
2003-07-01 14:38:38 +03:00
monty@mashka.mysql.fi
5dab55de73 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-07-01 13:30:55 +03:00
monty@mashka.mysql.fi
048d545a58 Code/testcase cleanups 2003-07-01 13:29:55 +03:00
monty@mashka.mysql.fi
2b0543148d Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-07-01 13:09:24 +03:00
monty@mashka.mysql.fi
730776c452 Fixed 'Unknown error' when doing ORDER BY on reference table which
was used with NULL value on NOT NULL column. (Bug #479)
2003-06-29 21:15:51 +03:00
monty@mashka.mysql.fi
81a84424ee SET CHARACTER SET DEFAULT didn't work (Bug #462) 2003-06-29 12:58:43 +03:00
monty@mashka.mysql.fi
863c563481 Fixed testcase after last changes 2003-06-27 06:40:24 +03:00
monty@mashka.mysql.fi
34919a03c4 Added thread variable max_seeks_for_key
Change optimizer to prefer key lookups before table scan
Change table scans to be done after tables with constrains on scanned table
2003-06-27 03:04:54 +03:00
serg@serg.mylan
c781673bd7 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-06-26 21:31:37 +02:00
serg@serg.mylan
8075aac74f bug with ranges and not_null_col=can_be_null_expr fixed 2003-06-26 21:30:53 +02:00
vva@eagle.mysql.r18.ru
c4e50b8ad7 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-3.23
into eagle.mysql.r18.ru:/home/vva/work/BUG_479_/mysql-3.23
2003-06-26 10:31:35 -04:00
hf@deer.(none)
ad5cbc0265 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.615
2003-06-26 09:01:25 +05:00
monty@mashka.mysql.fi
7655f05dc2 LEFT JOIN optimization: Change LEFT JOIN to normal join if possible 2003-06-26 05:38:19 +03:00
vva@eagle.mysql.r18.ru
5722ae6627 fixed bug with type of user variables (bug #551) 2003-06-25 21:11:23 -04:00
hf@deer.(none)
0ede29ffd0 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.674
2003-06-25 17:16:53 +05:00
hf@deer.(none)
45b3c643be Testcase for #674 added 2003-06-25 17:15:33 +05:00
hf@deer.(none)
044d077893 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.666
2003-06-24 17:09:44 +05:00
hf@deer.(none)
383d354c5c Test case for bug #666 2003-06-24 17:07:43 +05:00
hf@deer.(none)
3007290f83 Another bugfix for #615
Looks a bit nicer than previous one
2003-06-24 10:53:21 +05:00
monty@narttu.mysql.fi
28e96d95c5 Simple code cleanup 2003-06-23 20:05:54 +03:00
monty@narttu.mysql.fi
a51ea11147 SHOW GRANTS hided real grants when grants on both column and table (Bug 654) 2003-06-23 20:03:59 +03:00
gluh@gluh.mysql.r18.ru
afe1547866 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.defweek
2003-06-23 12:03:50 +05:00
guilhem@mysql.com
04e5a6baa9 Always send a fake Rotate event (this is roughly 70 bytes) when starting binlog_dump.
This way 3.23.58 slaves will always detect a 4.0.14 master (and stop)
immediately. BUG#198.
2003-06-21 18:10:59 +02:00
gluh@gluh.mysql.r18.ru
289d375f50 SCRUM
Task ID 894:
Backport default_week_format variable to 4.0
2003-06-19 14:02:19 +05:00
guilhem@mysql.com
4deb135b0b Changed change_master() to use ER_MASTER_INFO (better display). 2003-06-17 23:19:38 +02:00
serg@serg.mylan
b387b5add9 fulltext and left join bug fixed 2003-06-16 23:05:45 +02:00
guilhem@mysql.com
3f33f17114 Fix for nightly build test failure (test update).
More messages.
Testcase for bug 651.
2003-06-16 15:49:54 +02:00
guilhem@mysql.com
d2ea62cd14 Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-15 12:03:01 +02:00
guilhem@mysql.com
80edc81ed0 Simplified a test.
thd->enter_cond() and exit_cond(), so that the I/O thread accepts to stop
when it's waiting for relay log space.
Reset ignore_log_space_limit to 0 when the SQL thread terminates.
2003-06-15 12:01:51 +02:00
heikki@hundin.mysql.fi
4da7f485b7 Many files:
Merge InnoDB-4.0.14: SAVEPOINT now implemented; InnoDB now accepts also column prefix keys; crashing bug in ON UPDATE CASCADE fixed; page checksum formula fixed
2003-06-15 01:04:28 +03:00
guilhem@mysql.com
2e8cb7c3e0 Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-14 16:41:17 +02:00
hf@deer.(none)
db088dc477 test case for bug #614 2003-06-11 22:07:23 +05:00
guilhem@mysql.com
96c8d91a0c More error messages. This is intended to help debugging; presently I have a
support issue with an unclear message which can have N reasons for appearing.
This should help us know at which point it failed, and get the errno when
my_open was involved (as the reason for the unclear message is often a
permission problem).
RESET SLAVE resets last_error and last_errno in SHOW SLAVE STATUS (without this,
rpl_loaddata.test, which is expected to generate an error in last_error, influenced
rpl_log_pos.test).
A small test update.
Added STOP SLAVE to mysql-test-run to get rid of several stupid error messages
which are printed while the master restarts and the slave attempts/manages to
connect to it and sends it nonsense binlog requests.
2003-06-10 23:29:49 +02:00
guilhem@mysql.com
0058593c2d Test for bug 578. And a comment in slave.cc. 2003-06-05 17:02:00 +02:00
jani@ua126d19.elisa.omakaista.fi
4b55fbe092 Fixed a bug in concat_ws(), which did not add concat separator
in case of an empty string. Bug ID 586.
2003-06-05 15:06:19 +03:00
guilhem@mysql.com
3b974039f7 -- Waiting for Monty's approval before push --
Bug 571: play LOAD DATA INFILE the same way on the slave as it was on the master: 
if it was with IGNORE, do it with IGNORE,
if it was with REPLACE, do it with REPLACE,
and (the change) if it was with nothing, do it with nothing (not with IGNORE !!).
Bug 573: print a proper error message in case of duplicate entry in LOAD DATA INFILE
on the slave, i.e. a message where the keyname and key value appear :
'Duplicate entry '1' for key 1' and not 'Duplicate entry '%-.64s' for key %d'
2003-06-03 15:47:29 +02:00
monty@narttu.mysql.fi
f6a365a532 Small fixes (nothing nameworthy) 2003-06-01 23:40:01 +03:00
monty@narttu.mysql.fi
891d7ccd86 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-06-01 12:33:23 +03:00
monty@narttu.mysql.fi
02adbe6599 Fixed bug in ALTER TABLE DISABLE KEYS and INSERT DELAYED. Bug #478 2003-06-01 12:32:53 +03:00
bell@sanja.is.com.ua
2848e6c0d4 fixed bug 549 - incorect query cache memory formating on very small query cache sizes 2003-05-31 01:41:11 +03:00
guilhem@mysql.com
9864ac66c6 A trick (a useless update) to force the slave to wait for TWO rotate events
before stopping. This is to make the test's result predictable (depending
on the machine the results could formerly be slightly different, though
everything is sane in the code; it's not a bug).
2003-05-27 23:07:32 +02:00
monty@narttu.mysql.fi
da05a3e3f9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-05-27 16:40:39 +03:00
monty@narttu.mysql.fi
381492093e Fixed problem with mysql prompt when server disconnect. (Bug 356)
Fixed problem with localtime -> gmt where some times resulted in
different (but correct) timestamps. Now MySQL should use the smallest
possible timestamp value in this case.  (Bug 316)
2003-05-27 16:40:14 +03:00
guilhem@mysql.com
97f9aa2aaf temporary update of the test to satisfy merge; will commit a final update
soon.
2003-05-27 14:50:14 +02:00