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
lenz@mysql.com
6b720d93be
- Applied some Windows portability fixes for myisampack.c and sql_handler.cc
...
(backports from fixes made in 4.1)
2004-10-27 21:51:27 +02:00
paul@kite-hub.kitebird.com
8e53b2d602
texi2html:
...
Updated version of texi2html so that 4.0.22 HTML manual doesn't turn out all goofy.
2004-10-27 13:44:31 -05:00
joerg@mysql.com
4437787b78
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/M40/mysql-4.0
2004-10-27 19:40:22 +02:00
monty@mysql.com
d5691702d7
Fix when compiling without InnoDB
2004-10-27 18:57:49 +03:00
joerg@mysql.com
cee5d36be8
Change 'Build-tools/mysql-copyright' to ensure the receiving machines will build
...
without trying to re-run autotools.
(Backport from 4.1.7 for 4.0.22)
2004-10-27 17:54:10 +02:00
marko@hundin.mysql.fi
b5f49a3abd
Backport innodb_max_purge_lag from 4.1
2004-10-27 13:33:11 +03:00
bell@sanja.is.com.ua
3abe558fa8
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2004-10-24 11:32:08 +03:00
bell@sanja.is.com.ua
ce93a3c202
postreview fixes
2004-10-22 22:51:04 +03:00
bell@sanja.is.com.ua
bc68cd7d32
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
2004-10-22 22:10:52 +03:00
bell@sanja.is.com.ua
23ba4c325c
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
2004-10-22 22:08:46 +03:00
dlenev@mysql.com
6b6692dc4d
Part of fix for bug #6081 "Call to deprecated mysql_create_db() function
...
crashes server"
(in 4.0 we fix only connection stalling in case of error, crash itself is
fixed in 4.1, the test case for this code is also there).
2004-10-22 19:27:43 +04:00
heikki@hundin.mysql.fi
dd1b2ace33
os0file.c:
...
Add typecast from ulint to ssize_t in pread and pwrite, so that the type is according to the Linux man page; this will probably not help to fix the HP-UX 32-bit pwrite failure, since the compiler should do the appropriate typecasts anyway
2004-10-22 10:45:00 +03:00
heikki@hundin.mysql.fi
215cd1e4a3
row0mysql.c, row0ins.c:
...
Fix bug #5961 : release the dictionary latch during a long cascaded FOREIGN KEY operation, so that we do not starve other users
2004-10-22 00:25:57 +03:00
bell@sanja.is.com.ua
ded12c828d
Check of temporary tables hiding for query fetched from QC (BUG#6084)
2004-10-21 23:56:12 +03:00
monty@mysql.com
b32ffec8fd
Fix test case for innodb-lock
2004-10-20 16:04:28 +03:00
monty@mysql.com
9f8d47d81a
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/my/mysql-4.0
2004-10-20 11:25:46 +03:00
monty@mysql.com
1f8b3d0f22
Code cleanups (done during review of new code)
...
Rename innodb_table_locks_old_behavior -> innodb_table_locks
Set innodb_table_locks to off by default to get same behaviour as in MySQL 4.0.20
(This means that Innodb ignore table locks by default, which makes it easier to combine MyISAM and InnoDB to simulate a transaction)
2004-10-20 11:24:08 +03:00
heikki@hundin.mysql.fi
20ac420eb1
trx0rec.c:
...
test
2004-10-19 18:58:53 +03:00
paul@ice.snake.net
462aed6c99
libmysql.c:
...
Add note to mysql_hex_string() comment.
2004-10-19 07:44:20 -05:00
bell@sanja.is.com.ua
72fca68a1d
fixed retsult code
2004-10-19 11:54:33 +03:00
bar@mysql.com
c01c8f99ea
libmysql.c:
...
New function mysql_hex_string()
2004-10-19 09:50:47 +05:00
dellis@goetia.(none)
34e5df0d36
Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.0
2004-10-17 18:47:08 -05:00
dellis@goetia.(none)
b9509655a5
mysqld.cc:
...
BUG #5731 key_buffer_size not properly restricted to 4GB; use UINT_MAX32 for clarity.
2004-10-17 18:44:51 -05:00
hartmut@mysql.com
64c293fdaa
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/hartmut/projects/mysql/dev/4.0
2004-10-16 21:04:57 +02:00