Commit graph

6494 commits

Author SHA1 Message Date
Sinisa@sinisa.nasamreza.org
ef61b1a56f Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-06-30 12:33:35 +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
gluh@gluh.mysql.r18.ru
8573bdbff8 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.for_fix
2003-06-26 12:49:03 +05:00
gluh@gluh.mysql.r18.ru
7d43750eb6 Fix bug #673: MySQL 4.0.13 no SSL connection with mysql client possible 2003-06-26 12:47:36 +05: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
Sinisa@sinisa.nasamreza.org
66b60b57af Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-06-25 18:40:31 +03:00
Sinisa@sinisa.nasamreza.org
1d93c8f550 Fix for a bug which results in "Unknown Error".
Query should actually return empty result set, but currently can't, as
it attempts to store NULL in NOT NULL field, because that is a match
made by self join conditions.
2003-06-25 18:36:52 +03: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
lenz@mysql.com
dc704a2c20 - reverted change from AC_CONFIG_HEADERS to AM_CONFIG_HEADER in configure.in
again - even though the automake docs consider AM_CONFIG_HEADER obsolete, 
   it currently still breaks for too many people to justify this change
   at the moment.
2003-06-25 11:16:06 +02: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
039554f38b Changed connect with timeout to use poll() instead if socket() to avoid problems with many open files 2003-06-23 23:32:07 +03: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
Sinisa@sinisa.nasamreza.org
438ed49691 Removing one fix. 2003-06-23 16:05:22 +03:00
monty@narttu.mysql.fi
3bd661a66f Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-06-23 16:00:39 +03:00
serg@sergbook.mylan
d9287bfe61 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.0
2003-06-23 12:49:38 +02:00
serg@sergbook.mylan
c6d9d57b37 fixed bug in references column grants 2003-06-23 12:48:55 +02:00
monty@narttu.mysql.fi
eeee8f78c9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-06-23 13:04:21 +03:00
monty@narttu.mysql.fi
9791f47eee Added analyze as alias for optimize 2003-06-23 13:03:04 +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
heikki@hundin.mysql.fi
e2efb08c50 dict0dict.h, dict0dict.c, ha_innodb.cc:
In ORDER BY MySQL seems to set the key read flag also in the case where the primary key contains only a prefix of a column - not the whole column; to prevent potential bugs retrieve the whole column if the index contains a prefix of it
2003-06-22 16:20:06 +03:00
guilhem@mysql.com
9990ce576b Fixed cleanup_load_tmpdir() which deleted nothing. 2003-06-22 14:10:46 +02: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
hf@deer.(none)
f0f92fe443 Proposed fix for #674
This crash happens in rather exotic case when we try to run 
SELECT DISTINCT some_func(SUM(some_field)) GROUP BY another_field;
on a table with single row.
Optimizer marks this table as const, sets group=NULL (with remove_const)
thus, create_tmp_table makes mistake collecting columns for temporary table
and then crashes because the field_count gets less than hidden_columns_count.
2003-06-21 16:59:40 +05:00
hf@deer.(none)
27c67fbfe7 Fix for bug #666 (Nice number, yeah?) 2003-06-20 20:04:52 +05:00
hf@deer.(none)
eb901ea461 Proposed fix for #615
So now for the CREATE TABLE foo (id integer NOT NULL default 9)
INSERT INTO foo VALUES (NULL); we get an error
INSERT INTO foo VALUES (1), (NULL), (2); we get one warning
          and second record is set to 9

Is that what we want?
2003-06-20 18:52:40 +05:00
guilhem@mysql.com
55102bfa1a Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-20 15:50:00 +02:00
guilhem@mysql.com
e8a8b8c346 fix for BUG#691 (4.0 mysqlbinlog couldn't read 3.23 binlog).
Safe parenthesis.
2003-06-20 15:48:52 +02:00
lenz@mysql.com
bbd1cc89e8 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-06-20 15:20:22 +02:00
lenz@mysql.com
6f5cae4358 - added $(EXEEXT) to gen_lex_hash generation/execution to fix a build
problem on Windows/cygwin (BUG#668)
2003-06-20 15:19:51 +02:00
guilhem@mysql.com
def18de12c Warn that --log-slave-updates is used without --log-bin and disabled (WL#998) 2003-06-20 13:54:22 +02:00
miguel@hegel.(none)
10c81fb52d Fix error msg. Bug #681 2003-06-19 12:38:14 -04:00
gluh@gluh.mysql.r18.ru
79780cbd9c Fix for bug #616 mysqld crash / SSL with SQLyog 2003-06-19 15:38:52 +05: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
heikki@hundin.mysql.fi
eb0a4977ca page0page.c:
Track an assertion failure reported on the mailing list June 18th, 2003
2003-06-19 01:05:24 +03:00
lenz@mysql.com
beef0bf08e - Added /usr/lib64 to the path to search for libssl.a (required on AMD64)
- fixed a typo
2003-06-18 22:08:04 +02:00
lenz@mysql.com
9ccc017353 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-06-18 12:13:12 +02:00
heikki@hundin.mysql.fi
b8cc47797a row0vers.c:
Add forgotten mutex_enter()
2003-06-18 03:53:18 +03:00
heikki@hundin.mysql.fi
6d4fe0280f row0vers.c:
Add forgotten mtr_commit()
2003-06-18 03:49:34 +03:00
heikki@hundin.mysql.fi
d970e339dd row0sel.c, row0ins.c:
Fix error in previous push
2003-06-18 03:38:09 +03:00
heikki@hundin.mysql.fi
01eb3d1e62 row0vers.c, row0sel.c, row0ins.c:
Fix bug: InnoDB could print that it cannot find a clustered index record if an update undo, purge, and a consistent read coincided, in rare cases it might also have returned a wrong row in a query
2003-06-18 02:18:19 +03:00
guilhem@mysql.com
4deb135b0b Changed change_master() to use ER_MASTER_INFO (better display). 2003-06-17 23:19:38 +02:00
guilhem@mysql.com
0a0ca19940 Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-17 16:36:29 +02:00
guilhem@mysql.com
ab5479e6e2 Better error reporting in mysql-test-run (don't hide the important message
with 'head').
Test fix (this sync_with_master was nonsense).
Now all tests pass in 4.0 in autobuild.
2003-06-17 16:35:20 +02:00
Sinisa@sinisa.nasamreza.org
833e3db2a7 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-06-17 16:24:31 +03:00
Sinisa@sinisa.nasamreza.org
5a414bda8e Two Sprint tasks and two behaviour changes. 2003-06-17 16:20:07 +03:00