mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 12:01:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
42630 commits 2793 branches 343 tags 1.5 GiB
Commit graph

42630 commits

This branch
This branch
All branches
Author SHA1 Message Date
df@kahlann.erinye.com
9ed4299e22 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work1-testcases-20061 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-22 16:35:36 +01:00
df@kahlann.erinye.com
1b8b33bf83 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-22 16:34:22 +01:00
df@kahlann.erinye.com
5fe6fc1d2f Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2007-01-22 16:33:37 +01:00
df@kahlann.erinye.com
c124372550 after-merge fix 2007-01-22 16:32:57 +01:00
df@kahlann.erinye.com
58bf072264 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work1-testcases-20061 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
 2007-01-22 16:30:53 +01:00
svoj@mysql.com/june.mysql.com
afaebb6d62 BUG#24401 - MySQL server crashes if you try to retrieve data from 
corrupted table

Accessing a table with corrupted column definition results in server
crash.

This is fixed by refusing to open such tables. Affects MyISAM only.
No test case, since it requires crashed table.
 2007-01-22 16:34:58 +04:00
evgen@moonbone.local
e921ac7afc Bug#25123: ON DUPLICATE KEY clause allows fields not from the insert table. 
When inserting into a join-based view the update fields from the ON DUPLICATE
KEY UPDATE wasn't checked to be from the table being inserted into and were
silently ignored.

The new check_view_single_update() function is added to check that
insert/update fields are being from the same single table of the view.
 2007-01-22 15:14:38 +03:00
df@kahlann.erinye.com
02bfa163f0 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
 2007-01-22 12:46:38 +01:00
msvensson@neptunus.(none)
4bb6151a7a Add define for used type of third argument to 'accept' - Netware uses size_t 2007-01-22 12:34:39 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4e6b8a1d6a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/home/ram/work/b22026/b22026.5.0
 2007-01-22 15:28:42 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
df4cfc0bc1 after-merge fix. 2007-01-22 15:26:49 +04:00
ramil/ram@ramil.myoffice.izhnet.ru
1d9c8c8a3d Merge mysql.com:/home/ram/work/b22026/b22026.5.0 
into  mysql.com:/home/ram/work/b22026/b22026.5.1
 2007-01-22 14:58:36 +04:00
gkodinov/kgeorge@rakia.gmz
c9df1caac8 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt 
into  rakia.gmz:/home/kgeorge/mysql/autopush/B16590-5.1-opt
 2007-01-22 12:58:14 +02:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
a079f20aa8 Fix for bug #22026: Warning when using IF statement and large unsigned bigint 
We use INT_RESULT type if all arguments are of type INT for 'if', 'case', 
'coalesce' functions regardless of arguments' unsigned flag, so sometimes we can
exceed the INT bounds.
 2007-01-22 14:52:23 +04:00
gkodinov/kgeorge@macbook.gmz
9ea140d13e BUG#16590: Optimized does not do right "const" table pre-read 
st_table::const_key_parts member is used in determining if
 certain key has a prefix that is compared to constant(s) in
 the query predicates.
 If there's such prefix the index can be used to get the data
 from the remaining suffix columns in sorted order.
 However if a field is compared to another field from a "const"
 table the const_key_parts is not amended.
 This makes the optimizer unable to detect that the key can be 
 used for sorting and adds an extra filesort.
 Fixed by updating const_key_parts after reading in the "const"
 table.
 2007-01-22 12:51:21 +02:00
msvensson@neptunus.(none)
6db5790c2b gen_lex_hash does not need to link with odbc32*.lib 2007-01-22 10:41:36 +01:00
msvensson@neptunus.(none)
742af1c2a7 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2007-01-22 10:37:59 +01:00
joerg@trift2.
9e46e0aa74 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-01-22 10:32:22 +01:00
knielsen@ymer.(none)
f2bbf5225a Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint 
into  ymer.(none):/usr/local/mysql/x/mysql-5.1-new-maint
 2007-01-22 09:00:20 +01:00
knielsen@ymer.(none)
854ef6b0a3 Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint 
into  ymer.(none):/usr/local/mysql/x/mysql-5.0-maint
 2007-01-22 08:59:26 +01:00
knielsen@ymer.(none)
4d7a8de047 Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint 
into  ymer.(none):/usr/local/mysql/x/mysql-4.1-maint
 2007-01-22 08:58:49 +01:00
tsmith@siva.hindu.god
d71ae463ca Merge siva.hindu.god:/home/tsmith/m/inno/jan20/50 
into  siva.hindu.god:/home/tsmith/m/inno/jan20/51
 2007-01-21 20:30:54 -07:00
tsmith@siva.hindu.god
170296921f Merge siva.hindu.god:/home/tsmith/m/inno/jan20/50 
into  siva.hindu.god:/home/tsmith/m/inno/jan20/51
 2007-01-21 20:09:32 -07:00
tsmith@siva.hindu.god
fd4305e772 Merge siva.hindu.god:/home/tsmith/m/inno/jan20/50 
into  siva.hindu.god:/home/tsmith/m/inno/jan20/51
 2007-01-21 20:07:52 -07:00
tsmith@siva.hindu.god
6cb4282fd8 Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41 
into  siva.hindu.god:/home/tsmith/m/inno/jan20/50
 2007-01-21 20:05:21 -07:00
tsmith@siva.hindu.god
70119a1627 Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41 
into  siva.hindu.god:/home/tsmith/m/inno/jan20/50
 2007-01-21 20:02:24 -07:00
tsmith@siva.hindu.god
b448b62278 Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots 
Fixes:
- Bug #24299: 
- Bug #25596:
 2007-01-21 19:55:17 -07:00
tsmith@siva.hindu.god
bcc8452782 Applied innodb-5.1-ss1186 
Fixes bugs:
- Bug #20877: InnoDB data dictionary memory footprint is too big
- Bug #24741: existing cascade clauses disappear when adding foreign keys
 2007-01-21 18:18:11 -07:00
tsmith@siva.hindu.god
7ce6170cf9 Applied innodb-5.0-ss1230 snapshot 
Fixes:
- Bug #25596:
 2007-01-21 17:58:02 -07:00
mtaylor@qualinost.(none)
04a63996f4 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-01-21 12:15:20 -08:00
brian@zim.(none)
b2bfd35378 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/archive-newformat-5.1
 2007-01-21 11:43:37 -08:00
brian@zim.(none)
068d7c8203 Just adding support for a "minor" version number. 2007-01-21 11:41:00 -08:00
baker@bk-internal.mysql.com
42345b83c3 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-01-21 02:21:23 +01:00
brian@zim.(none)
4b58f41481 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/archive-newformat-5.1
 2007-01-20 17:21:22 -08:00
brian@zim.(none)
dee24c66ba 1) New dirty state for files (need this for longterm fast recovery) 
2) We now store shortest and longest row information.
3) archive_reader can now check and backup files (even if they are hot)
4) We now record longest and shortest row information for stats.
 2007-01-20 17:19:54 -08:00
cmiller@zippy.cornsilk.net
02bed038bb Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint-topush 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-topush
 2007-01-20 09:34:01 -05:00
dlenev@mockturtle.local
92704745f7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg25044
 2007-01-20 14:10:20 +03:00
dlenev@mockturtle.local
8f23e65b00 Fixed test case for bug #25044 "ALTER TABLE ... ENABLE KEYS acquires 
global 'opening tables' lock." after merging it into 5.1 tree.
 2007-01-20 14:08:53 +03:00
jonas@perch.ndb.mysql.com
68efcc062b Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-01-20 03:02:39 +01:00
jonas@perch.ndb.mysql.com
162aa18e15 ndb - Fix bug when sending NODE_VERSION_REP 2007-01-20 03:01:37 +01:00
mtaylor@qualinost.(none)
d9366f9743 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
 2007-01-19 17:36:05 -08:00
mtaylor@qualinost.(none)
72a6096eb4 Moving version-script to acinclude.m4 2007-01-19 17:34:47 -08:00
mtaylor@qualinost.(none)
c77cebec11 files are in storage/ndb in 5.1. fix merge from 5.0 2007-01-19 17:06:53 -08:00
mtaylor@qualinost.(none)
8778f60112 We only want to do these things if we are building Ndb. 2007-01-19 17:02:46 -08:00
mtaylor@qualinost.(none)
9e24d548b6 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-01-19 16:58:03 -08:00
mtaylor@qualinost.(none)
dab88cfaa3 Fixed the make distcheck problem. We only really need to create libndb.ver if we are building Ndb. 2007-01-19 16:54:01 -08:00
mtaylor@qualinost.(none)
14c3bfa908 One final time making the path right. 2007-01-19 14:58:08 -08:00
mtaylor@qualinost.(none)
d29c6a2547 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
 2007-01-19 14:30:41 -08:00
mtaylor@qualinost.(none)
d116ff2973 Merge recycle.(none):/src/bug22807/my50-bug22807 
into  recycle.(none):/src/mysql-5.0-maint
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
---
I cut and pasted in the wrong direction I think. We don't have storage until 5.1... 
---
missed storage in one more place
---
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
---
added storage back to patch after merge from 5.0-maint
---
Removed ndb/src dir and libndb.ver.in from it that got introduced from the 5.0-maint merge.
 2007-01-19 14:29:01 -08:00
mtaylor@qualinost.(none)
8e6f3ab33b Added libndb.ver to BUILT_SOURCES to force it to get removed during make distclean 2007-01-19 14:26:06 -08:00