mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
40335 commits 2784 branches 343 tags 1.7 GiB
Commit graph

40335 commits

This branch
This branch
All branches
Author SHA1 Message Date
lars@mysql.com/black.(none)
de01754c19 Merge mysql.com:/home/bkroot/mysql-4.1-rpl 
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
 2006-11-13 12:44:24 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
2b2529de79 WL#3368 mixed binlog_format default 
An amendment for parsing argument in case NDB is compiled and active.
  NDB switches from mixed to row-based and back per each query. The previous patch
  was not aware of such behaviour and made exceptional assingment to row-based when
  no command line arg --binlog-format provided.
  
  Removing #if HAVE_NDB_BINLOG block alltogether: ndb supports mixed and if server 
  was build without NDB using binlog nothing to care.
  Test for this piece of code is rather specific. While there is active bug23110
  ndb_alter_table and some other should fail if no explict --binlog-format is given:
  mysql-test-run ndb_alter_table
 2006-11-13 13:20:35 +02:00
joerg@trift2.
5057fa01f4 support-files/mysql.spec.sh : Make the server report its features in the first test run. 2006-11-13 12:10:12 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
7b0eb936d1 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/merge_50
 2006-11-13 12:45:47 +02:00
gkodinov/kgeorge@macbook.gmz
d6672f711d Merge macbook.gmz:/Users/kgeorge/mysql/work/B19216-4.1-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/B19216-5.0-opt
 2006-11-13 12:44:56 +02:00
gkodinov/kgeorge@macbook.gmz
9a41822bdd Bug #19216: Client crashes on long SELECT 
The server sends a number of columns to the client.
 It uses a limited "fast" function for that instead of the
 general one. This fast function cannot send numbers larger 
 than 2 bytes. 
 This causes the client to expect smaller number of columns. 
 The client writes outside of the allocated memory buffer 
 as a result.
 Fixed the server to use the general function to send column
 count.
 Fixed the client to check the column count before writing
 column data.
 2006-11-13 12:28:55 +02:00
joerg@trift2.
ccadac3267 Build the generic RPMs including the "partition" feature. bug#23949 2006-11-13 11:10:27 +01:00
kostja@bodhi.local
f5d2077061 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2006-11-12 23:48:59 +03:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
5a20c54201 bug#19402 SQL close to the size of the max_allowed_packet fails on the slave 
comments are fixed as was suggested in reviews.
 2006-11-12 20:01:58 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
eb28e03189 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl 
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.1/bug24190_many_field_in_rec_is_0
 2006-11-12 18:04:19 +02:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
fe5de9f5c3 Correcting BUG/WL identifier extraction to allow multiple references to auxilary 
bugs/wls in cset's comments. The targetted BUG's or WL's identifier must be specified
the first in the comments. The referred bugs wls can be typed in same as the targeted
clickable format.
If the the target of the fix is a WL and there are some references to bugs
then the first found reference is regarded as "co-target" so that the bug's identifier
comes up on the subject line along with the WL's and commit mail will update
the bug page. The latter feature can be disarmed (if there is no need to update
the referred bug's page) with typing the first a pseudo-bug pattern (bug#0).

This paticular cset will generate subject line containing bug#0 (as it was the first
referred) whereas the old version would put in the subject line the last referred
pattern (e.g bug#2147483648).
 2006-11-12 13:38:13 +02:00
kostja@bodhi.local
c1f0ef538a Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2006-11-12 10:56:10 +03:00
kostja@bodhi.local
0f455a81dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-12 10:55:33 +03:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
746ece99e0 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1
 2006-11-11 14:46:06 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
1319f3552c Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-11-11 14:32:10 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
cddbb0f817 mysql-test-run.pl: 
Test for base directory when a RPM install corrected
 2006-11-11 14:12:30 +01:00
kostja@bodhi.local
de170fb332 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2006-11-11 14:59:14 +03:00
kostja@bodhi.local
0cdaa7c138 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-11 14:51:19 +03:00
joerg@trift2.
a19a5b5f03 Merge trift2.:/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-10 20:24:05 +01:00
joerg@trift2.
ca06382435 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-10 20:02:33 +01:00
tsmith@quadxeon.mysql.com
ce805aff3f Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
 2006-11-10 19:41:47 +01:00
tsmith@quadxeon.mysql.com
82b6712a27 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
 2006-11-10 19:39:26 +01:00
tsmith@quadxeon.mysql.com
b2da711fbf Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
 2006-11-10 19:38:07 +01:00
joerg@trift2.
e47f753a85 Merge trift2.:/MySQL/M50/bug24023-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-10 19:11:26 +01:00
joerg@trift2.
32d9fdaa98 Merge trift2.:/MySQL/M41/push-4.1 
into  trift2.:/MySQL/M50/push-5.0
 2006-11-10 19:07:52 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
d3976edabe Bug #24190 many exportable definitions of field_in_record_is_null 
mysql had several(2) exportable definitions of field_in_record_is_null function.

Fixed with adding static.
 2006-11-10 17:22:43 +02:00
joerg@trift2.
743ab0c6a4 Merge trift2.:/MySQL/M41/bug17194-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2006-11-10 15:54:58 +01:00
joerg@trift2.
2ab3d0bfb4 Merge trift2.:/MySQL/M41/clone-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2006-11-10 15:52:53 +01:00
df@kahlann.erinye.com
a185c4f6ea Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-4.1
 2006-11-10 14:49:07 +01:00
df@kahlann.erinye.com
403ecf18c6 Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-10 14:44:01 +01:00
df@kahlann.erinye.com
abd8eeaaa7 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 
into  kahlann.erinye.com:/home/df/mysql/build/51
 2006-11-10 13:27:50 +01:00
df@kahlann.erinye.com
59e33edf22 Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
 2006-11-10 13:14:21 +01:00
df@kahlann.erinye.com
f1764fa99f add --report-features to mysql-test-run.pl 2006-11-10 13:12:08 +01:00
petr/cps@outpost.site
e06f74f9f9 Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  outpost.site:/home/cps/mysql/trees/4.1-runtime-bug9191
 2006-11-10 15:05:38 +03:00
gkodinov/kgeorge@macbook.gmz
0357510dca fixed bad 5.0->5.1 merge 2006-11-10 12:43:44 +02:00
ted@ted.mysql.internal
1c8a6cfc37 Merge ted.mysql.internal:/home/ted/src/mysql/50-gca 
into  ted.mysql.internal:/home/ted/src/mysql/mysql-5.1-new-maint
 2006-11-10 07:23:42 +03:00
ted@ted.mysql.internal
bc9ca699fb Memory allocation bug fixed 2006-11-10 07:21:10 +03:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
ef9f68a7c9 Merge mysql.com:/Users/kent/mysql/bk/lic/my51-lic 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1
 2006-11-10 02:45:34 +01:00
kent@c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
040f95494d Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic 
into  mysql.com:/Users/kent/mysql/bk/lic/my51-lic
 2006-11-10 02:36:29 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
54f6fc07b9 Merge mysql.com:/Users/kent/mysql/bk/lic/my50-lic 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2006-11-10 02:35:01 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
264beeff86 Merge mysql.com:/Users/kent/mysql/bk/lic/my41-lic 
into  mysql.com:/Users/kent/mysql/bk/lic/my50-lic
 2006-11-10 02:28:31 +01:00
kent@mysql.com/c-634072d5.010-2112-6f72651.cust.bredbandsbolaget.se
f893128839 mysql-test-run.sh: 
Added --force-restart pseudo server argument to shell version as well
 2006-11-10 02:22:33 +01:00
joerg@trift2.
dce6efd035 mysql-test/install_test_db.sh 
Adapt to the different path of the server program, if installation was by RPM.
    Missing in the first changeset for bug#17194.
 2006-11-09 17:43:31 +01:00
gkodinov/kgeorge@rakia.gmz
0be7e70399 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 
into  rakia.gmz:/home/kgeorge/mysql/autopush/B20191-5.0-opt
 2006-11-09 18:03:49 +02:00
gkodinov/kgeorge@macbook.gmz
e7ff881c6b Bug #20191: getTableName gives wrong or inconsistent result when using VIEWs 
When compiling GROUP BY Item_ref instances are dereferenced in 
setup_copy_fields(), i.e. replaced with the corresponding Item_field 
(if they point to one) or Item_copy_string for the other cases.
Since the Item_ref (in the Item_field case) is no longer used the information
about the aliases stored in it is lost.   
Fixed by preserving the column, table and DB alias on dereferencing Item_ref
 2006-11-09 16:55:42 +02:00
holyfoot/hf@deer.(none)
09c0569b6d Merge bk@192.168.21.1:mysql-5.1-opt 
into  mysql.com:/home/hf/work/8663/my51-8663
 2006-11-09 16:10:15 +04:00
holyfoot/hf@mysql.com/deer.(none)
129fbca293 Merge bk@192.168.21.1:mysql-5.0-opt 
into  mysql.com:/home/hf/work/8663/my50-8663
 2006-11-09 16:08:31 +04:00
bar@bar.intranet.mysql.r18.ru
da0a0ad20a Merge mysql.com:/usr/home/bar/mysql-5.0.b21505 
into  mysql.com:/usr/home/bar/mysql-5.1.b21505
 2006-11-09 14:46:01 +04:00
bar@mysql.com/bar.intranet.mysql.r18.ru
aa1c8a5826 Bug#21505 Create view - illegal mix of collation for operation 'UNION' 
The problem was that any VIEW columns had always implicit derivation.
  Fix: derivation is now copied from the original expression
  given in VIEW definition.
  For example:
  - a VIEW column which comes from a string constant
    in CREATE VIEW definition have now coercible derivation.
  - a VIEW column having COLLATE clause
    in CREATE VIEW definition have now explicit derivation.
 2006-11-09 14:41:34 +04:00
gkodinov/kgeorge@macbook.gmz
eb1a8fcd3c Merge macbook.gmz:/Users/kgeorge/mysql/work/mem-test-5.0-opt 
into  macbook.gmz:/Users/kgeorge/mysql/work/mem-test-5.1-opt
 2006-11-09 12:27:53 +02:00