guilhem@mysql.com
02e93b5758
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-20 17:16:03 +02:00
guilhem@mysql.com
5db56a106b
Making FLUSH TABLES WITH READ LOCK block COMMITs of existing transactions,
...
in a deadlock-free manner. This splits locking the global read lock in two steps.
This fixes a consequence of this bug, known as:
BUG#4953 'mysqldump --master-data may report incorrect binlog position if using InnoDB'
And a test.
2004-08-20 16:35:23 +02:00
ram@gw.mysql.r18.ru
c40f3a2c97
A fix (bug #5115 : Erronious Syntax Error when comment placed inside of "create table")
2004-08-20 13:37:58 +05:00
serg@serg.mylan
068a57b12c
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-19 23:11:16 +02:00
serg@serg.mylan
b81af1c750
less strict assert to take into account weird cases
2004-08-19 23:10:33 +02:00
marko@hundin.mysql.fi
1773e759e4
ha_innodb.cc:
...
innobase_mysql_tmpfile(): call dup() and my_close() on the file
returned by create_temp_file()
in order to avoid memory leak caused by my_open() being paired with close()
2004-08-19 23:22:16 +03:00
ingo@mysql.com
ad7f0fa51e
Build bug on 64-Bit platforms.
...
Removed improper casts.
Thanks to Joerg Bruehe for the fix.
2004-08-19 21:41:10 +02:00
serg@serg.mylan
dd3db08be3
typos fixed
2004-08-19 13:07:54 +02:00
serg@serg.mylan
3360c997ac
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-19 12:00:03 +02:00
serg@serg.mylan
8ef3cdc2f9
take dec. point into account in store_double_in_string
2004-08-19 11:21:08 +02:00
guilhem@mysql.com
96a000ae78
cosmetic change
2004-08-19 10:01:01 +02:00
serg@serg.mylan
754fafd28f
copied new my_vsnprintf from 4.1. use "ul" when merging
2004-08-19 02:35:59 +02:00
guilhem@mysql.com
6f8f231c35
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-19 00:43:48 +02:00
guilhem@mysql.com
42d30b758b
Fix for BUG#4971 "CREATE TABLE ... TYPE=HEAP SELECT ... stops slave (wrong DELETE in binlog)":
...
replacing the no_log argument of mysql_create_table() by some safer method
(temporarily setting OPTION_BIN_LOG to 0) which guarantees that even the automatic
DELETE FROM heap_table does not get into the binlog when a not-yet-existing HEAP table
is opened by mysql_create_table().
2004-08-19 00:29:11 +02:00
serg@serg.mylan
8ce92878a2
Bug 4937: different date -> string conversion when using
...
SELECT ... UNION and INSERT ... SELECT ... UNION
2004-08-18 14:46:31 +02:00
serg@serg.mylan
a17f968954
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-18 09:25:27 +02:00
heikki@hundin.mysql.fi
6feb6ea545
srv0start.c, ut0mem.c, ut0dbg.c, ut0dbg.h, srv0start.h:
...
Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com , polished a little by Heikki Tuuri)
mysqld.cc, ha_innodb.cc:
Changes for NetWare to exit the InnoDB gracefully instead of crashing the server (patch by PRam@novell.com , polished a little by Heikki Tuuri)
2004-08-18 01:48:01 +03:00
serg@serg.mylan
ccc97ac12c
use my_vsnprintf() just in case
...
bug#4925
2004-08-18 00:04:43 +02:00
guilhem@mysql.com
32f905f73c
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-17 17:34:53 +02:00
guilhem@mysql.com
8c9fc27f7c
Fix for BUG#5073 "--disable-local-infile has no effect if client reads it with MYSQL_READ_DEFAULT":
...
that was a forgotten '~' probably.
2004-08-17 14:12:37 +02:00
heikki@hundin.mysql.fi
48b61d6180
Merge heikki@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-08-17 14:30:36 +03:00
ram@gw.mysql.r18.ru
f1ab1b129f
A fix (bug #5055 : SQL_SELECT_LIMIT=0 crashes command line client):
...
mysql outwits itself.
2004-08-17 11:12:22 +05:00
konstantin@mysql.com
ee89880473
A desperate attempt to comment one place where we do conversions.
2004-08-16 15:07:45 -07:00
heikki@hundin.mysql.fi
77aa9abf1a
Merge heikki@build.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/heikki/mysql-4.0
2004-08-16 19:06:01 +03:00
guilhem@mysql.com
f08912e568
Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/mysql_src/mysql-4.0
2004-08-14 15:25:52 +02:00
guilhem@mysql.com
4a96a8a64f
Fix for BUG#5050 "mysql-test-run fails on rpl_trunc_binlog after 'make install'":
...
The binlog files we use for some tests must be installed like other mysql-test/std_data/ files.
2004-08-14 15:24:40 +02:00
heikki@hundin.mysql.fi
5273b4e5f5
row0mysql.c:
...
Fix bug: if we RENAME a table, InnoDB forgot to load the foreign key constraints that reference the new table name, and forgot to check that they are compatible with the table
2004-08-13 17:27:58 +03:00
lenz@mysql.com
586e5af9e7
- manual merge
2004-08-13 16:25:23 +02:00
guilhem@mysql.com
c9a46a43d2
Escaping [] so that darwin[7-8] gets into 'configure' and not darwin7-8
...
Adding a compilation define so that on recent Darwin mysqld does not react to SIGHUP and SIGQUIT:
this fixes a rpl000001 problem on our Powermac G5 machine (popping after an upgrade from 10.3.4 to
10.3.5) and is expected to fix
BUG#2030 "relay bin log on slave resets multiple times a second"
(i.e. under some Mac OS X Panther versions, mysqld receives many SIGHUP and SIGQUIT).
So this fix is more a problem-hider than a real understanding of why mysqld receives so many signals.
Note that we saw other problems on this OS where mysqld reacts to Ctrl-Z but apparently only once,
where using SSL seems to make the problem more frequent...
2004-08-13 15:29:47 +02:00
lenz@mysql.com
7fac8214b6
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0
2004-08-13 12:44:08 +02:00
vva@eagle.mysql.r18.ru
698a88b15d
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
2004-08-13 02:27:21 +05:00
vva@eagle.mysql.r18.ru
3681594d08
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_4358/mysql-4.0
2004-08-13 02:25:50 +05:00
vva@eagle.mysql.r18.ru
b1c63b909b
Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0
2004-08-13 01:25:35 +05:00
vva@eagle.mysql.r18.ru
17af0b8f57
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
...
into eagle.mysql.r18.ru:/home/vva/work/BUG_4973/mysql-4.0
2004-08-13 01:21:22 +05:00
lenz@mysql.com
b1f5aa0094
- portability fix for SCO Open Server 5.0.7 (thanks to Boyd Gerber)
2004-08-12 21:55:05 +02:00
lenz@mysql.com
c484f82b21
- Fixed two small version number issues in MySQL-shared-compat.spec
2004-08-12 21:40:34 +02:00
lenz@mysql.com
c8f8ca889f
- giving a range does not work for platform detection in configure.in
...
- resorting to having to separate sections for darwin7 and darwin8
2004-08-12 21:15:49 +02:00
vva@eagle.mysql.r18.ru
5406709672
fixed Bug #4358 Problem with HAVING clause that uses alias
...
from the select list and TEXT field
make setup_copy_fields to insert Item_copy_string for blobs in
the beginning of the copy_funcs (push_back instead of push_front)
the thing is that Item_copy_string::copy for function can call
Item_copy_string::val_int for blob via Item_ref.
But if Item_copy_string::copy for blob isn't called before,
it's value will be wrong.
So all the Item_copy_string::copy for blobs should be called before
Item_copy_string::copy for functions.
2004-08-12 20:37:31 +05:00
lenz@mysql.com
98298c77bc
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0
2004-08-12 13:52:43 +02:00
ram@gw.mysql.r18.ru
0f0b1ebe62
Added initial sorting in order to make test case repeatable.
2004-08-12 16:16:38 +05:00
ram@gw.mysql.r18.ru
a8d3ad5e59
Added initial sorting in order to make test case repeatable.
2004-08-12 16:02:12 +05:00
lenz@mysql.com
65b3c21def
Merge mysql.com:/space/my/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0-build
2004-08-12 12:10:36 +02:00
ram@gw.mysql.r18.ru
494a3b0559
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b4898
2004-08-12 14:59:33 +05:00
ram@gw.mysql.r18.ru
955e869d7c
A test case (bug #4898 : User privileges depending on ORDER BY Settings of table db)
2004-08-12 14:49:16 +05:00
ram@gw.mysql.r18.ru
798952dcf2
A fix (Bug#4898: User privileges depending on ORDER BY Settings of table db)
2004-08-12 09:41:35 +05:00
acurtis@pcgem.rdg.cyberkinetica.com
259bce85b4
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into pcgem.rdg.cyberkinetica.com:/usr/home/acurtis/work/bug4411
2004-08-11 23:26:44 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
bc78a46ac4
Bug#4411
...
Fix for server hang bug
2004-08-11 23:24:36 +01:00
serg@serg.mylan
9a938cc009
Merge bk-internal:/home/bk/mysql-4.0/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2004-08-11 23:44:08 +02:00
serg@serg.mylan
6023b58b9f
Bug #4797 - 32 bit and 64 bit builds behave differently on int32 overflow
2004-08-11 23:43:41 +02:00
lenz@mysql.com
46ddf8f702
- fixed Log file naming in Boostrap
2004-08-11 23:01:08 +02:00