Commit graph

6471 commits

Author SHA1 Message Date
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
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
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)
27c67fbfe7 Fix for bug #666 (Nice number, yeah?) 2003-06-20 20:04:52 +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
serg@serg.mylan
b387b5add9 fulltext and left join bug fixed 2003-06-16 23:05:45 +02:00
serg@serg.mylan
9b3dccd662 reverting Monty's "fix" that turned a warning into an error. 2003-06-16 19:07:48 +02:00
guilhem@mysql.com
54a5e17dbd Merge gbichot@213.136.52.20:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-06-16 15:55:56 +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
heikki@hundin.mysql.fi
29796e6240 row0mysql.c, dict0dict.ic:
Cleanup
ha_innodb.cc, data0type.h:
  Make sure non-latin1 users can downgrade from 4.0.14 to an earlier version if they have not created DATA_BLOB column prefix indexes
2003-06-16 00:39:46 +03:00
heikki@hundin.mysql.fi
95ffe2d0ca handler.h, ha_innodb.h, ha_innodb.cc:
Cleanup; remove compiler warning on Windows
2003-06-15 23:23:04 +03: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
guilhem@mysql.com
28d3c3d76f - Fix for bug 651: now a dying SQL slave threads wakes up any waiting MASTER_POS_WAIT().
Could not add a testcase for this: if the test goes into a MASTER_POS_WAIT, it waits
until this terminates (even doing "connection other_con" to launch "stop slave" is blocked).
- In MASTER_POS_WAIT() don't test if the I/O slave is running, but if the SQL thread
is running.
- Some DBUG info for this bugfix.
2003-06-14 16:40:00 +02:00
jani@rhols221.adsl.netsonic.fi
8a52c2d20b Added option --skip-kill-mysqld to mysqld_safe. This can be useful,
if one is running many mysqlds through mysqld_multi, for example.
Without this option, on Linux one mysqld_safe process may kill
other mysqlds as well, if started using the same binary and path.
2003-06-14 12:29:42 +03:00
lenz@mysql.com
925f621c64 - replaced obsolete Macro AM_CONFIG_HEADER with AC_CONFIG_HEADERS
- Added missing function name in checking for sem_init in posix4 libs on
   Solaris
2003-06-13 14:47:23 +02:00
monty@narttu.mysql.fi
9e5ec9a5f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-06-12 22:40:08 +03:00
monty@narttu.mysql.fi
ecdb1c768c Changed safemalloc structure to not have to be 8 byte aligned. (Portability problem) 2003-06-12 22:39:45 +03:00
serg@serg.mylan
977c66b4e7 removed a wrong cast that limited ulonglong options to max. ulong value. 2003-06-12 18:46:12 +02:00
serg@serg.mylan
36aae14f1a HANDLER priv check fixed 2003-06-12 17:38:15 +02:00