Commit graph

8569 commits

Author SHA1 Message Date
joerg@mysql.com
134aa0b97b Change "Do-compile" to make automatic build log analysis easier and
to run the standard tests with "--force" (default, can be switched off).
2004-11-23 17:18:41 +01:00
serg@serg.mylan
b7aa981578 "Table file %s was created in MySQL 4.1+" is an error, not a warning 2004-11-22 19:18:35 +01:00
serg@serg.mylan
eb8d9d3ffe merged with ul 2004-11-22 18:59:17 +01:00
serg@serg.mylan
af51d26238 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-11-22 18:47:23 +01:00
serg@serg.mylan
dca2182fdc ft_boolean_search.c:
bug#6705 - (+trunc1* +trunc2*)
fulltext.test, fulltext.result:
  bug#6705
2004-11-22 18:37:30 +01:00
dlenev@mysql.com
40083741ee Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg6439
2004-11-19 17:54:14 +03:00
guilhem@mysql.com
7743dbbb56 When mysqlbinlog prints LOAD DATA INFILE, let it print the thread id. Some customer would have benefited
much from this in his recovery. All this change does is adding one commented (#) line before the LOAD DATA
command, so it is quite innocuous.
2004-11-18 22:59:17 +01:00
serg@serg.mylan
2d8c21f700 test for bug#5528 2004-11-17 13:38:35 +01:00
heikki@hundin.mysql.fi
dd64377dc2 ha_innodb.cc:
Fix InnoDB bug #6287: if one uses INSERT IGNORE to insert several rows at a time, and the first inserts are ignored because of a duplicate key collision, then InnoDB in a replication slave assigns AUTO_INCREMENT values 1 bigger than in the master
2004-11-16 20:37:42 +02:00
dlenev@mysql.com
5ddc564d89 Proposed fix for bug #6439 "from_unixtime() function returns wrong datetime
values for too big argument".

Added range checking for from_unixtime() argument, cleaned up code 
a bit.
2004-11-15 16:11:13 +03:00
serg@serg.mylan
3d67df4cff wrong constant fixed - boolean fulltext searches like "+something +smth*"
were stopping at docid 0xffffffff
2004-11-12 22:55:00 +01:00
paul@kite-hub.kitebird.com
79d8bde11e Makefile.am:
Add -acc flag for texi2html to handle accented characters.
2004-11-12 14:15:06 -06:00
jani@ua141d10.elisa.omakaista.fi
76b8c8747d Removed an unneccessary for() and variable. 2004-11-12 19:22:58 +02:00
ram@gw.mysql.r18.ru
77fe1baf1d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b6564
2004-11-12 12:38:07 +04:00
acurtis@pcgem.rdg.cyberkinetica.com
2ad7d5c662 Bug#6123 - GRANT USAGE creates useless mysql.db row
Prevent creation of a row which grants no rights
  Test included
2004-11-11 20:59:03 +00:00
jani@a80-186-24-72.elisa-laajakaista.fi
54dac2cfac Some code clean-up and optimization. 2004-11-11 16:59:36 +02:00
ram@gw.mysql.r18.ru
98df9313c0 A fix (bug #6564: QUOTE(NULL) returns NULL, not the string 'NULL') 2004-11-11 18:20:40 +04:00
jani@a80-186-24-72.elisa-laajakaista.fi
4f04217879 Removed check for .ini file elsewhere, except on Windows. 2004-11-11 16:20:39 +02:00
paul@kite-hub.kitebird.com
dba07d0871 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0
into kite-hub.kitebird.com:/src/extern/MySQL/bk/mysql-4.0
2004-11-10 08:56:49 -06:00
guilhem@mysql.com
609d7661a7 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-11-10 15:13:45 +01:00
guilhem@mysql.com
0c4363b6d0 Fix for BUG#6522 "Replication fails due to a rolled back transaction in the binlog"
When we are writing a transaction to the binlog, we log BEGIN/COMMIT with zero error code.
Example: all statements of trans succeeded, connection lost and so implicit rollback:
we don't want ER_NET* errors to be logged in the BEGIN/ROLLBACK events, while statement
events have 0. If there was really a serious error code, it's already in the statement events.
2004-11-10 15:07:55 +01:00
paul@kite-hub.kitebird.com
0d0ed072da Alphabetize some out-of-order options in option structure.
Revise the --hex-blob help message string. (This will need
revising after merge to 4.1, too, but the CHAR BINARY and
VARCHAR BINARY data types will be BINARY and VARBINRY.)
2004-11-09 11:03:02 -06:00
bar@mysql.com
a83f8e60ab mysql.h:
Adding a prototype for the new function.
2004-11-09 00:19:39 +04:00
jani@a193-229-222-105.elisa-laajakaista.fi
bfdf57ef31 Fixed a typo that caused segmentation fault when using
--defaults-extra-file option.
2004-11-05 23:58:30 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
862978dde5 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
2004-11-05 18:59:40 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
083a2f5613 Changed default.c so that it now checks for my.ini and then
my.cnf from the default directories.
2004-11-05 18:59:19 +02:00
bar@mysql.com
b911810af7 mysqldump.c:
Dump VARCHAR(n) BINARY in HEX if --hex-blob too.
2004-11-05 20:33:56 +04:00
joerg@mysql.com
5e2b6e3035 Change "Bootstrap" so that it will not fail on BK source trees of other versions;
this is important because this 4.0 "Bootstrap" is the one generally used on host "build".
2004-11-05 15:22:03 +01:00
bar@mysql.com
630ea6e63c client_priv.h:
Backport --hex-blob to 4.0
2004-11-05 09:23:53 +04:00
bar@mysql.com
0a375d4b72 libmysql.c:
After-merge clean-up
2004-11-05 09:07:07 +04:00
bar@mysql.com
d8503ba39e Merge 2004-11-05 09:05:59 +04:00
bar@mysql.com
e9c50b8773 libmysql.def, libmysql.c:
Clean-ups
2004-11-05 09:00:04 +04:00
guilhem@mysql.com
76f51406ce Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-11-04 19:19:51 +01:00
guilhem@mysql.com
1869cd9f83 Fix for BUG##5714 "Insert into MyISAM table and select ... for update]":
the fact that the transaction log is empty does not mean we're not in a transaction
(it could be BEGIN; SELECT * FOR UPDATE FROM ibtable: then we don't want to commit now, even if
the statement is a MyISAM update).
With a testcase.
2004-11-04 19:19:23 +01:00
tim@siva.hindu.god
a20399c0ae Merge siva.hindu.god:/opt/home/tim/m/40/bk
into siva.hindu.god:/opt/home/tim/m/40/a
2004-11-04 10:29:24 -07:00
joerg@mysql.com
476cd83b7c Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/push-4.0 2004-11-04 13:21:56 +01:00
dlenev@mysql.com
f78990e28f Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg6387
2004-11-04 14:25:08 +03:00
joerg@mysql.com
cb0bd6f57d The files stored in "Docs/Images" within the "mysqldocs" BK tree must be included
in the source tar-ball for distribution. This is done by using the "DISTFILES" macro
in a new "Docs/Images/Makefile". As the source BK tree does not contain these files,
they are copied from the "mysqldocs" tree at release build time.
This changeset relies on "bk commit - mysqldoc tree (joerg:1.2276)" of today.
2004-11-04 11:18:12 +01:00
joerg@mysql.com
e77a5200f3 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/mysql-4.0
2004-11-03 19:02:43 +01:00
dlenev@mysql.com
fa21feda93 Fix for bug #6387 "Queried timestamp values do not match the inserted
value if server runs in time zone with leap seconds".

Now in my_gmt_sec() function we take into account difference between
our target and estimation in seconds part.
2004-11-03 17:59:03 +00:00
marko@hundin.mysql.fi
b58cb6b50f InnoDB: fix bugs in the FOREIGN KEY parser (Bug #6340) 2004-11-03 14:56:48 +02:00
marko@hundin.mysql.fi
73bb6b9c33 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-11-03 11:09:41 +02:00
tim@siva.hindu.god
b0510c7fd4 Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROC
for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself.
2004-11-02 17:53:25 -07:00
heikki@hundin.mysql.fi
22269d451a ha_innodb.cc:
Backport Jan's fix of the LOAD DATA INFILE REPLACE duplicate key error bug (Bug #5835) to 4.0
2004-11-02 13:21:11 +02:00
joerg@mysql.com
10291f3664 Ensure that a source distribution contains 'libmysql/libmysql.def'
which is needed for Netware ports.
2004-11-01 18:15:45 +01:00
marko@hundin.mysql.fi
a3294186ec mysqld.cc:
Describe innodb_max_purge_lag
  Improve description of innodb_table_locks
2004-11-01 12:08:44 +02:00
heikki@hundin.mysql.fi
d22a24d871 row0mysql.c, pars0pars.c, eval0eval.c, dict0load.c, dict0dict.c, dict0crea.c:
Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it
dict0dict.c:
  Fix bug #3478: InnoDB's FOREIGN KEY tables treated table and database names as case-insensitive; RENAME TABLE t to T would hang in an endless loop if t had a foreign key constraint defined on it; fix also a hang that would occur if one tried in ALTER TABLE or RENAME TABLE to create a foreign key constraint name that collided with another existing name
2004-10-31 15:43:29 +02:00
lenz@mysql.com
35e8670301 - bumped up version number from 4.0.22 to 4.0.23 in configure.in
- tagged ChangeSet@1.2048.1.2 as "mysql-4.0.22"
2004-10-29 09:24:21 +02:00
bell@sanja.is.com.ua
8894a6bb73 close table before next iteration of table proccesing in mysql_admin_table (to allow open next table) 2004-10-28 21:14:00 +03:00
lenz@mysql.com
158455bd8e Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-10-27 22:18:42 +02:00