cmiller@zippy.cornsilk.net
b96ab282ea
Bug #23427 : incompatible ABI change in 5.0.26?
...
Revert 1 June change enough to restore ABI compatibility with previous
versions.
2006-10-20 17:17:24 -04:00
kroki/tomash@moonlight.intranet
f6ad9e51ed
Merge mysqldev@production.mysql.com:my/mysql-5.0-release
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726-fix-2
2006-10-03 17:42:00 +04:00
kroki/tomash@moonlight.intranet
8798b462b5
Fix for the patch for bug#21726: Incorrect result with multiple
...
invocations of LAST_INSERT_ID.
Reding of LAST_INSERT_ID inside stored function wasn't noted by caller,
and no LAST_INSERT_ID_EVENT was issued for binary log.
The solution is to add THD::last_insert_id_used_bin_log, which is much
like THD::last_insert_id_used, but is reset only for upper-level
statements. This new variable is used to issue LAST_INSERT_ID_EVENT.
2006-10-03 13:38:16 +04:00
scottlee@calico.site
3eaee36070
Back port change from 5.1 that adds the Windows database files to the source package.
...
This is needed for WiX pacakging.
2006-10-02 23:05:52 -04:00
bteam/mysqldev@mysql.com/production.mysql.com
36a28d1f37
Merge mysqldev@bk-internal:/home/bk/mysql-5.0-engines
...
into mysql.com:/data0/mysqldev/my/mysql-5.0-release
2006-10-02 14:26:06 +02:00
kroki/tomash@moonlight.intranet
5ea8adfae7
BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID
...
Non-upper-level INSERTs (the ones in the body of stored procedure,
stored function, or trigger) into a table that have AUTO_INCREMENT
column didn't affected the result of LAST_INSERT_ID() on this level.
The problem was introduced with the fix of bug 6880, which in turn was
introduced with the fix of bug 3117, where current insert_id value was
remembered on the first call to LAST_INSERT_ID() (bug 3117) and was
returned from that function until it was reset before the next
_upper-level_ statement (bug 6880).
The fix for bug#21726 brings back the behaviour of version 4.0, and
implements the following: remember insert_id value at the beginning
of the statement or expression (which at that point equals to
the first insert_id value generated by the previous statement), and
return that remembered value from LAST_INSERT_ID() or @@LAST_INSERT_ID.
Thus, the value returned by LAST_INSERT_ID() is not affected by values
generated by current statement, nor by LAST_INSERT_ID(expr) calls in
this statement.
Version 5.1 does not have this bug (it was fixed by WL 3146).
2006-10-02 14:28:23 +04:00
svoj@mysql.com/april.(none)
25ef3a6ee1
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-10-02 14:53:03 +05:00
svoj@mysql.com/april.(none)
361c46eefe
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-10-02 14:52:09 +05:00
svoj@mysql.com/april.(none)
5f3cf1eca3
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-10-02 14:46:10 +05:00
svoj@mysql.com/april.(none)
7afbe5f86e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-10-02 14:42:12 +05:00
istruewing@chilla.local
c2d73af1b2
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into chilla.local:/home/mydev/mysql-4.0-bug20719
2006-09-29 19:55:09 +02:00
istruewing@chilla.local
c672a7710d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug20627
2006-09-29 19:17:03 +02:00
svoj@mysql.com/april.(none)
a2c427395c
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
2006-09-29 21:42:29 +05:00
svoj@mysql.com/april.(none)
deaf470839
Fixed that max_zfile_size was incorrectly calculated on big-endian boxes.
...
Was introduced with patch for bug#21675.
2006-09-29 21:36:17 +05:00
istruewing@chilla.local
fe7de5b96c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug20627
2006-09-29 17:59:56 +02:00
istruewing@chilla.local
5ad8f1c464
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug22384
2006-09-29 17:17:01 +02:00
svoj@mysql.com/april.(none)
b6684e6f84
Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-engines
2006-09-29 19:04:41 +05:00
svoj@mysql.com/april.(none)
0297046a10
Fix a test case according to fix for bug#10974.
2006-09-29 19:00:52 +05:00
istruewing@chilla.local
23f9362026
Merge chilla.local:/home/mydev/mysql-5.0--team
...
into chilla.local:/home/mydev/mysql-5.0-bug22384
2006-09-29 15:28:38 +02:00
evgen@moonbone.local
dead2e0f14
view.test:
...
After merge fix
2006-09-29 01:35:11 +04:00
evgen@moonbone.local
ee67c4c453
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into moonbone.local:/work/5505-bug-5.0-opt-mysql
2006-09-29 01:01:52 +04:00
evgen@moonbone.local
f6fbbf2002
Fixed bug#5505: Wrong error message on INSERT into a view
...
On an INSERT into an updatable but non-insertable view an error message was
issued stating the view being not updatable. This can lead to a confusion of a
user.
A new error message is introduced. Is is showed when a user tries to insert
into a non-insertable view.
2006-09-29 01:00:18 +04:00
istruewing@chilla.local
00a7b0e834
Merge chilla.local:/home/mydev/mysql-4.1-bug22384
...
into chilla.local:/home/mydev/mysql-5.0-bug22384
2006-09-28 21:50:46 +02:00
istruewing@chilla.local
fd2a6a7a40
Merge chilla.local:/home/mydev/mysql-4.0-bug22384
...
into chilla.local:/home/mydev/mysql-4.1-bug22384
2006-09-28 21:47:42 +02:00
svoj@mysql.com/april.(none)
ad7da7f1de
Merge mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-5.0-engines
2006-09-29 00:00:27 +05:00
svoj@mysql.com/april.(none)
2de51adffa
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21617/mysql-4.1-engines
2006-09-28 22:14:31 +05:00
svoj@mysql.com/april.(none)
b271d7653b
BUG#21617 - crash when selecting from merge table with inconsistent indexes
...
Crash may happen when selecting from a merge table that has underlying
tables with less indexes than in a merge table itself.
If number of keys in merge table is not bigger than requested key number,
return error.
2006-09-28 22:10:06 +05:00
svoj@mysql.com/april.(none)
19d9bdcecb
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21675/mysql-5.0-engines
2006-09-28 20:33:59 +05:00
svoj@mysql.com/april.(none)
3336ecf896
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG21675/mysql-5.0-engines
2006-09-28 20:32:40 +05:00
svoj@mysql.com/april.(none)
efb75811bf
BUG#21675 - engine=archive 2GB file limit, when reached mysqld restarts on any query
...
If mysqld is linked against system installed zlib (which is likely compiled w/o
LFS) and archive table exceedes 2G, mysqld will likely be terminated with SIGXFSZ.
Prior to actual write perform a check if there is space in data file. This fixes
abnormal process termination with SIGXFSZ.
No test case for this bugfix.
2006-09-28 20:30:15 +05:00
istruewing@chilla.local
52758d8615
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-bug20719-m
2006-09-28 12:20:17 +02:00
istruewing@chilla.local
4027fc8dca
Bug#22384 - DELETE FROM table causes "Incorrect key file for table"
...
Deletes on a big index could crash the index when it needs to
shrink.
Put a forgotten negation operator in.
No test case. It is too big for the test suite. And it does not
work with 4.0, only with higher versions. It is attached to the
bug report.
2006-09-28 11:41:38 +02:00
gkodinov@dl145s.mysql.com
de5542a0d9
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-28 10:37:21 +02:00
gkodinov@dl145s.mysql.com
b0167d265f
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
2006-09-28 10:36:04 +02:00
gkodinov@dl145s.mysql.com
55cc4fd5c6
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1
...
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
2006-09-28 10:19:25 +02:00
istruewing@chilla.local
629076c5b3
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-bug20719-m
2006-09-28 08:55:01 +02:00
gluh@mysql.com/gluh.(none)
4aaf7e34ff
additional 'after merge' fix
2006-09-27 20:11:11 +05:00
gluh@mysql.com/gluh.(none)
c3d63bef2b
after merge fix
2006-09-27 19:21:29 +05:00
svoj@mysql.com/april.(none)
b724a03e08
After merge fix.
2006-09-27 18:33:31 +05:00
gluh@mysql.com/gluh.(none)
437c94317b
Merge mysql.com:/home/gluh/MySQL/Merge/4.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2006-09-27 18:06:46 +05:00
gluh@mysql.com/gluh.(none)
a039376c43
Patch for bug#21432 is reverted
2006-09-27 17:49:16 +05:00
svoj@mysql.com/april.(none)
bfb6ff6bdd
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-27 15:42:00 +05:00
svoj@mysql.com/april.(none)
a324cb8934
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
2006-09-27 15:34:52 +05:00
istruewing@chilla.local
cab5981250
Merge bk-internal.mysql.com:/home/bk/mysql-4.0
...
into chilla.local:/home/mydev/mysql-4.0-bug20719
2006-09-27 12:29:12 +02:00
svoj@mysql.com/april.(none)
c41bd4461b
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2006-09-27 15:25:00 +05:00
istruewing@chilla.local
fdc6500965
Merge chilla.local:/home/mydev/mysql-4.1-bug20719-m
...
into chilla.local:/home/mydev/mysql-5.0-bug20719-m
2006-09-27 12:03:49 +02:00
istruewing@chilla.local
ac778232cd
Bug#20719 - Reading dynamic records with write buffer could fail
...
After merge fix.
2006-09-27 11:55:30 +02:00
gkodinov/kgeorge@macbook.gmz
903387afc0
Bug #21174 : Index degrades sort performance and optimizer does not honor IGNORE INDEX
...
- reversed the patch for 5.0 and moved to 5.1
2006-09-27 12:53:53 +03:00
istruewing@chilla.local
6ff6d80e57
Merge chilla.local:/home/mydev/mysql-4.1-bug20719
...
into chilla.local:/home/mydev/mysql-4.1-bug20719-m
2006-09-27 09:30:54 +02:00
holyfoot/hf@mysql.com/deer.(none)
542cdbbc42
Merge bk@192.168.21.1:mysql-5.0-opt
...
into mysql.com:/home/hf/work/mysql-5.0-mrg
2006-09-27 11:46:02 +05:00