database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-10 23:02:54 +03:00
Code Activity
46,939 Commits 3,268 Branches 1,096 Tags
016bff8adcc2332772b51f8dbdc5a3d926f5a04c
Commit Graph

18065 Commits

Author SHA1 Message Date
msvensson@neptunus.(none)
91518b335e Expect the file "have_mysql_upgrade.result" to contain the 
result from "require mysql_upgrade"
 2006-11-13 16:55:05 +01:00
msvensson@neptunus.(none)
bf8a9e544c Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 16:39:44 +01:00
andrey@example.com
9bfc5f5772 give a bit more time for the execution of the events 2006-11-13 15:28:23 +01:00
holyfoot/hf@mysql.com/deer.(none)
5d66d7fb14 Merge mysql.com:/home/hf/work/embt/my41-embt 
into  mysql.com:/home/hf/work/embt/my50-embt
 2006-11-13 18:16:52 +04:00
holyfoot/hf@mysql.com/deer.(none)
c5f375f6bf delayed.test fixed 2006-11-13 18:12:15 +04:00
gkodinov/kgeorge@rakia.gmz
e347eb1995 Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-opt 
into  rakia.gmz:/home/kgeorge/mysql/autopush/B19216-4.1-opt
 2006-11-13 15:40:19 +02:00
gkodinov/kgeorge@macbook.gmz
cd7613b265 merge 4.1->5.0 of the test suite for bug 19216 2006-11-13 15:37:04 +02:00
msvensson@neptunus.(none)
00a34629ef Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-13 13:41:13 +01:00
msvensson@neptunus.(none)
5687847387 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint-mysql_upgrade 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 13:40:37 +01:00
msvensson@neptunus.(none)
5110d91ec3 Make it possible for .test suites to run "mysql_upgrade" 
Add new test file mysql_upgrade.test
 2006-11-13 13:39:49 +01:00
msvensson@neptunus.(none)
4efc0f8ef4 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-13 13:38:33 +01:00
msvensson@neptunus.(none)
10d4ecfbe6 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-13 13:36:50 +01:00
msvensson@neptunus.(none)
3eff32965d Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-13 13:33:33 +01:00
mskold/marty@mysql.com/linux.site
4acc1af12c bug#21507 I can't create a unique hash index in NDB: Added possibillity to create hash only indexes with NULL valued attributes, but any NULL valued access will become full table scan with pushed condition on index attribute values. 5.1 re-implementation 2006-11-13 12:56:45 +01:00
lars@black.(none)
63c906f749 Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
 2006-11-13 12:45:31 +01:00
lars@mysql.com/black.(none)
c5d56416ba Merge mysql.com:/home/bkroot/mysql-5.0-rpl 
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
 2006-11-13 12:44:53 +01:00
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
msvensson@neptunus.(none)
716621db3f Make --mem a pure flag. If there is need to specifically set the location 
use MTR_MEM environment variable
 2006-11-13 12:44: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
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
dlenev@mockturtle.local
d8aad85fe9 Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg23651 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
 2006-11-13 11:29:40 +03:00
dlenev@mockturtle.local
6fd6e099c9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  mockturtle.local:/home/dlenev/src/mysql-5.0-bg23651
 2006-11-13 11:15:02 +03:00
dlenev@mockturtle.local
dd1a4f5742 Fix for bug bug#23651 "Server crashes when trigger which uses 
stored function invoked from different connections".

Invocation of trigger which was using stored function from different
connections caused server crashes (for non-debug server this happened
in highly concurrent environment, but debug server failed on assertion
in relatively simple scenario).

Item_func_sp was not safe to use in triggers (in other words for
re-execution from different threads) as artificial TABLE object
pointed by Item_func_sp::dummy_table referenced incorrect THD
object. To fix the problem we force re-initialization of this
object for each re-execution of statement.
 2006-11-13 11:10:49 +03:00
holyfoot/hf@mysql.com/deer.(none)
6e0045ed20 embedded-mode tests fixed 2006-11-13 10:39:15 +04:00
istruewing@chilla.local
502912b8d7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2006-11-12 14:15:01 +01: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
iggy@rolltop.ignatz42.dyndns.org
3488f21817 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my41-mtr_winfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
 2006-11-10 15:53:34 -05:00
iggy@rolltop.ignatz42.dyndns.org
b808c8e829 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-11-10 15:52:49 -05:00
iggy@rolltop.ignatz42.dyndns.org
09d305e0b9 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my51-mtr_winfix
 2006-11-10 15:50:04 -05:00
iggy@rolltop.ignatz42.dyndns.org
82ad2e5e92 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my41-mtr_winfix 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_winfix/my50-mtr_winfix
 2006-11-10 15:49:10 -05:00
iggy@rolltop.ignatz42.dyndns.org
73ff367be3 Test Suite failing on Windows because the $opt_report_features variable was not defined before use. 2006-11-10 15:47:11 -05:00
cmiller@zippy.cornsilk.net
501c11cfc5 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-10 14:51:01 -05:00
cmiller@zippy.cornsilk.net
03bf5e399c Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my51-bug20691 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-10 14:49:43 -05:00
cmiller@zippy.cornsilk.net
d7ef5de57f Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-10 14:49:39 -05:00
cmiller@zippy.cornsilk.net
7197da9cc2 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my50-bug20691 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-10 14:48:37 -05:00
cmiller@zippy.cornsilk.net
70802780a5 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my50-bug20691 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug20691/my51-bug20691
 2006-11-10 14:48:07 -05: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
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
msvensson@neptunus.(none)
59475a119f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-10 16:20:34 +01:00
msvensson@neptunus.(none)
b693d5fdb3 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-10 16:07:49 +01:00
msvensson@neptunus.(none)
43ef5e6a0c Look for "mysqlmanager" also in "bin" directory 
Improve log message
 2006-11-10 15:58:38 +01: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