mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-25 00:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
32451 commits 2774 branches 343 tags 1.6 GiB
Commit graph

8927 commits

Author SHA1 Message Date
bar@mysql.com
b2b020b318 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-23 14:14:32 +04:00
bar@mysql.com
296d4b2f2c Bug#15376: Unassigned multibyte codes are converted to U+0000 
Mergeing changes into 5.0
 2006-03-23 14:03:39 +04:00
mskold@mysql.com
25c149da04 Fix for Bug#17431 INSERT IGNORE INTO returns failed: 1296: err 4350 'Transaction already aborted' 2006-03-23 09:48:46 +01:00
bar@mysql.com
1008146d86 Merge mysql.com:/usr/home/bar/mysql-4.1.b15376 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-23 12:41:28 +04:00
bar@mysql.com
fb7826ed25 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-23 12:27:23 +04:00
bar@mysql.com
a4d4ed9ec8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-23 12:27:10 +04:00
bar@mysql.com
d97d48cb26 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b17374
 2006-03-23 11:51:46 +04:00
msvensson@neptunus.(none)
40e6821e07 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-23 08:51:24 +01:00
msvensson@neptunus.(none)
ba2ddc869c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-23 08:22:11 +01:00
msvensson@neptunus.(none)
c6e6c0d649 Move the replcae result to before the correct select 2006-03-23 08:21:16 +01:00
bar@mysql.com
b372b28e1f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-23 10:25:04 +04:00
bar@mysql.com
ddc37c547f Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-23 10:20:40 +04:00
bar@mysql.com
6ab496ac06 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-23 10:19:55 +04:00
bar@mysql.com
82de23010b Merge mysql.com:/usr/home/bar/mysql-4.1.b17374 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-23 10:17:31 +04:00
lars@mysql.com
a8ba8a30a6 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 17:28:47 +01:00
msvensson@neptunus.(none)
123f513593 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-22 17:28:46 +01:00
lars@mysql.com
c07b9184aa Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 17:28:46 +01:00
msvensson@neptunus.(none)
7d3a809695 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-22 16:52:31 +01:00
msvensson@neptunus.(none)
13c5e780ed Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-22 16:48:35 +01:00
msvensson@neptunus.(none)
bbc4051826 Fix windows results using "replace_result" 2006-03-22 16:47:45 +01:00
tomas@poseidon.ndb.mysql.com
615699a82e Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-22 16:06:34 +01:00
tomas@poseidon.ndb.mysql.com
128cb5821e changed comment in disabled.def 2006-03-22 16:04:38 +01:00
tomas@poseidon.ndb.mysql.com
e0b655d003 continued: 
ha_partition should skip ndb specific flags used by sql apply thread to signal idempotency behaviour
 2006-03-22 15:56:53 +01:00
msvensson@neptunus.(none)
451a7129bb Bug#18071 Result from MATCH() uses too many decimals 
- Use FORMAT as a workaround to only output the first 6 decimals of the value returned
from MATCH
 - This has been done before
 2006-03-22 14:57:24 +01:00
bar@mysql.com
d735a60964 Merge mysql.com:/usr/home/bar/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.1-new
 2006-03-22 15:10:42 +04:00
msvensson@neptunus.(none)
46b5b6c644 Dsiable udf.test waiting for a check wheter udf_example.so exists 2006-03-22 12:03:15 +01:00
msvensson@neptunus.(none)
89a5b96ee4 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-22 11:12:28 +01:00
lars@mysql.com
ad7c20c7c4 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 10:50:46 +01:00
bar@mysql.com
cab060d2e2 Merge mysql.com:/usr/home/bar/mysql-4.1.b18004 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-03-22 13:11:31 +04:00
bar@mysql.com
235c5d35a3 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18172
 2006-03-22 13:01:16 +04:00
lars@mysql.com
e0e39bf656 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 
into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
 2006-03-22 08:42:45 +01:00
msvensson@neptunus.(none)
ffe694b831 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-22 07:57:56 +01:00
mats@mysql.com
cd550dd5db Post-merge fixes after merging mysql-5.0 with mysql-5.1-new 2006-03-22 00:47:36 +01:00
msvensson@neptunus.(none)
dcceaae8b6 Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-03-21 20:08:25 +01:00
msvensson@neptunus.(none)
ede2943ea0 Merge neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-03-21 18:51:47 +01:00
lars@mysql.com
20290ee5f6 Made rpl_flushlog_loop use wait_slave_status instead of sleep. 
This to save 5 seconds of test time.
More test to follow. :-)
 2006-03-21 17:40:51 +01:00
mats@mysql.com
7351d35693 Merge mysql.com:/home/bkroot/mysql-5.0 
into  mysql.com:/home/bk/b18293-mysql-5.0
 2006-03-21 14:37:41 +01:00
mats@mysql.com
1d4ee057ee BUG#18293 (Values in stored procedures written to binlog unescaped): 
Generating character set-independent quoting of strings for the
binary log when executing statements from inside stored procedure.
 2006-03-21 14:35:49 +01:00
gluh@mysql.com
c9d4d6aa29 5.0 -> 5.1 merge 2006-03-21 16:26:47 +04:00
tomas@poseidon.ndb.mysql.com
bdc3f48545 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
 2006-03-21 12:34:45 +01:00
tomas@poseidon.ndb.mysql.com
c9c0a6d690 disabled undeterministic test 2006-03-21 12:33:13 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
4d2b8f8ef6 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
 2006-03-20 22:47:48 -05:00
msvensson@neptunus.(none)
4064528279 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
 2006-03-20 21:41:27 +01:00
msvensson@neptunus.(none)
0811648e31 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835
 2006-03-20 21:35:05 +01:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
738176c15f Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug17754
 2006-03-20 14:41:50 -05:00
pappa@c-8808e253.1238-1-64736c10.cust.bredbandsbolaget.se
bd77396a94 BUG#17754 
Added new syntax ALTER TABLE t1 REMOVE PARTITIONING,
changed semantics of ALTER TABLE t1 ENGINE=X; to not remove partitioning
Fix a number of mix engine bugs in partitioning
 2006-03-20 14:36:21 -05:00
msvensson@neptunus.(none)
f12b979fb1 Merge neptunus.(none):/home/msvensson/mysql/bug11835/my50-bug11835 
into  neptunus.(none):/home/msvensson/mysql/bug11835/my51-bug11835
 2006-03-20 20:16:53 +01:00
holyfoot@mysql.com
fc94004a65 merging 2006-03-20 19:22:56 +04:00
gluh@eagle.intranet.mysql.r18.ru
820731c6ed Fix for bug#15336 Partitions: crash if create table as select 
added HA_EXTRA_WRITE_CACHE case to ha_partition::extra()
 2006-03-20 18:58:21 +04:00
gluh@eagle.intranet.mysql.r18.ru
c0420a5c5e Bug#14367 Partitions: crash if utf8 column 
use part_info->item_free_list instead of thd->free_list during partition function parsing
 2006-03-20 17:41:45 +04:00