Commit graph

7120 commits

Author SHA1 Message Date
guilhem@mysql.com
f162eca688 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-19 19:08:43 +02:00
guilhem@mysql.com
118670017f removing my chmods so that the test can be run on non-Unix platforms
(kind request from the Novell team).
Note that old chmods in rpl_rotate_logs remain.
2003-09-19 19:07:41 +02:00
dlenev@mysql.com
b038a7c4dd Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340
2003-09-19 20:34:59 +04:00
dlenev@mysql.com
c4384241ec Bugfix for bug #1340, style fix before push 2003-09-19 20:34:58 +04:00
lenz@mysql.com
40cabaa773 - fixed several typos ("uppdate"->"update" and "tryed"->"tried") 2003-09-19 18:34:57 +02:00
dlenev@mysql.com
3c55dbe3db Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1340
2003-09-19 20:34:57 +04:00
vva@eagle.mysql.r18.ru
d623fc83b1 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_1073/mysql-4.0
2003-09-19 12:34:56 -04:00
dlenev@mysql.com
69aed374a5 Fix for bug #1340 (More careful checks if we met proper Create_file_log_event before Append or Exec event we are processing now) 2003-09-19 16:43:56 +04:00
serg@serg.mylan
02753ead71 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-18 14:35:25 +02:00
lenz@mysql.com
caf23b6999 - force the removal of /var/lock/subsys/mysql on MySQL shutdown 2003-09-17 22:41:01 +02:00
lenz@mysql.com
74077c79fc - added make_win_src_distribution.sh to EXTRA_SCRIPTS 2003-09-17 22:01:08 +02:00
jani@rhols221.adsl.netsonic.fi
33250a01ba Fixed Bug#1291, client displays wrong prompt when in the middle of
backticks.
2003-09-17 21:41:36 +03:00
jani@rhols221.adsl.netsonic.fi
adce64f57e Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0
2003-09-17 21:09:41 +03:00
jani@rhols221.adsl.netsonic.fi
6b2cf69dca Fixed a bug in default.c, which caused quoted arguments not
being read correctly from my.cnf.
2003-09-17 21:08:40 +03:00
kostja@oak.local
6fba16eabf Applied Monty corrections to the FULL SCAN
optimiser bug patch.
2003-09-17 21:52:05 +04:00
kostja@oak.local
f13d9312a7 Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0
into oak.local:/home/kostja/mysql/mysql-4.0-root
2003-09-17 14:01:18 +04:00
kostja@oak.local
048245ae9d fixed test result to be in sync with the optimiser 2003-09-17 14:00:43 +04:00
monty@narttu.mysql.fi
88faa2ab95 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-09-17 12:23:15 +03:00
lenz@mysql.com
6c41860d9f Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-09-16 22:10:19 +02:00
kostja@oak.local
a68800954c Merge oak.local:/home/kostja/mysql/mysql-4.0-root
into oak.local:/home/kostja/mysql/mysql-4.0-rightnow
2003-09-16 21:26:26 +04:00
kostja@oak.local
de3019c61a comment made more explanatory 2003-09-16 21:20:16 +04:00
kostja@oak.local
668e7dcec8 select.test cleanup 2003-09-16 20:28:29 +04:00
monty@narttu.mysql.fi
dfd981505a More explicit error messages from myisamchk 2003-09-16 14:45:42 +03:00
kostja@oak.local
29eec6c738 join buffer cache usage/not usage is taken
into account to increase the cost of FULL SCAN
2003-09-16 04:04:54 +04:00
kostja@oak.local
2931565e0d Merge oak.local:/home/kostja/mysql/mysql-4.0-root
into oak.local:/home/kostja/mysql/mysql-4.0-rightnow
2003-09-16 02:44:47 +04:00
greg@mysql.com
c4fb6c74d7 Merge gweir@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/greg/bk/4.0
2003-09-15 17:40:13 -04:00
greg@mysql.com
564dad6c53 Remove 3.23 InstallShield files, improve make_win_src_distribution, add extra myTest.dsp to be copied into distributions as a fix for BUG#999 2003-09-15 17:39:50 -04:00
kostja@oak.local
ab576328f0 Fixed bug in the optimiser for FULL TABLE SCAN case:
to estimate correctly cost of full table scan we should take into
account rows read and skipped on each iteration.
2003-09-15 22:21:39 +04:00
lenz@mysql.com
6da669ef95 - Bumped up version number from 3.23.58 to 3.23.59 in configure.in
- Tagged ChangeSet 1.1413 as "mysql-3.23.58"
2003-09-15 14:44:53 +02:00
bell@sanja.is.com.ua
702b5ad4d6 fixed server crash on moving query block with pointers to same table in it (BUG#988)
removed server options
2003-09-15 15:16:13 +03:00
lenz@mysql.com
52bf068cff Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-09-15 13:37:46 +02:00
greg@mysql.com
cc6e3a2ec9 New Windows source package automation for 3.23 2003-09-12 19:58:22 -04:00
monty@mashka.mysql.fi
9d0859c48b Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-09-13 02:26:24 +03:00
dlenev@mysql.com
1c11077d60 Replaced deprecated since OpenSSL 0.9.7 des_ calls and types with
their newer DES_ versions.
Provided macros for backward compatibility.
2003-09-12 22:33:43 +04:00
serg@serg.mylan
3494fa4a0a merged (ul) 2003-09-12 19:53:52 +02:00
serg@serg.mylan
6920d8d876 merged 2003-09-12 19:42:47 +02:00
dlenev@mysql.com
4871a35e8a Regenerated expired CA certificate and signed dependant certificates 2003-09-12 20:41:12 +04:00
monty@mashka.mysql.fi
b98307f332 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-09-12 18:27:11 +03:00
guilhem@mysql.com
40a88045cb Quick backport of the following bugfix from MySQL 4.0.14.
DO NOT COPY THIS CODE TO 4.0. The bugfix is better in 4.0,
but here in 3.23 we don't want to add a new error code so
we just use ER_EMPTY_QUERY. Bug was:
"If a query was ignored on the slave (because of
@code{replicate-ignore-table} and other similar rules), the slave
still checked if the query got the same error code (0, no error) as on
the master. So if the master had an error on the query (for example,
``Duplicate entry'' in a multiple-row insert), then the slave stopped
and warned that the error codes didn't match. (Bug #797)"
2003-09-12 17:26:48 +02:00
serg@serg.mylan
f3dc041621 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-09-12 16:33:49 +02:00
guilhem@mysql.com
64a679c923 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-12 15:50:28 +02:00
lenz@mysql.com
969badc68d Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-09-12 15:48:53 +02:00
guilhem@mysql.com
d1cd9bd498 Fix for BUG#1258 (Trying to use the mysqlbinlog with -h and -u option gives segmentation
fault). Fix is just initializing "host" (and "user") with 0, not a string.
2003-09-12 15:48:48 +02:00
lenz@mysql.com
9578d0b0ea - fixed yet another C++-style comment in a .c file that made the IBM
C compiler barf
2003-09-12 15:48:05 +02:00
lenz@mysql.com
3afe61d02c Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-09-12 13:16:59 +02:00
lenz@mysql.com
edfbc3d3e8 Portability fixes:
- removed "-traditional-cpp" from the darwin6 compile flags, as it broke
   compilation with gcc-3.3 on Mac OS X and does not seem to be required 
   in general.
 - make sure to link libmysqld/examples/mysqltest.c with a C++ compiler, 
   as the embedded server library (libmysqld.a) includes C++ code. This
   broke compilation with non-gcc compilers.
2003-09-12 12:42:34 +02:00
heikki@hundin.mysql.fi
562f3ce654 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2003-09-12 01:36:28 +03:00
heikki@hundin.mysql.fi
3b7140aed0 row0sel.c:
Fix buglets in previous push
2003-09-12 01:35:32 +03:00
guilhem@mysql.com
f35f432982 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-09-11 23:31:49 +02:00
heikki@hundin.mysql.fi
be05042bae row0sel.c:
Fix bug: if a primary key contains more than one column, then MySQL seems to do fetch next even for a unique search condition: this in turn caused unnecessary locking which did not agree what the InnoDB manual promised
2003-09-12 00:31:43 +03:00