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

34024 commits

This branch
This branch
All branches
Author SHA1 Message Date
pekka@mysql.com
7fcc77f49c ndb - bug#14509 v5.1 part 2/2 : handler level 2006-05-25 12:13:47 +02:00
pekka@mysql.com
577246509f ndb - bug#14509 v5.1 part 1/2 : ndb api level [requires part 2/2] 2006-05-25 12:03:02 +02:00
pekka@mysql.com
e10998672b Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
 2006-05-17 12:56:59 +02:00
pekka@mysql.com
54963c2e52 ndb - bug#14509 [related] re-do auto-incr error handling 2006-05-17 12:40:10 +02:00
pekka@mysql.com
8f5467d17e Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
 2006-05-16 16:23:12 +02:00
pekka@mysql.com
fc7320466a ndb - bug#14509 [related] fix a return value 2006-05-16 16:17:30 +02:00
pekka@mysql.com
852c0dbf64 Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
 2006-05-16 13:13:50 +02:00
pekka@mysql.com
dd58dd51a1 ndb - bug#14509 [related] setAutoIncrement: add error handling 2006-05-16 12:58:41 +02:00
pekka@mysql.com
d0d8b6c9f3 Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
 2006-05-16 09:37:11 +02:00
sergefp@mysql.com
a70bfd6c69 Merge mysql.com:/home/psergey/tmp_merge3 
into  mysql.com:/home/psergey/mysql-5.1-merge2
 2006-05-13 22:40:26 +04:00
acurtis@xiphis.org
ff71980af7 fix binlog results 2006-05-13 01:09:00 -07:00
acurtis@xiphis.org
a84822afde fix partition test 2006-05-12 22:30:13 -07:00
acurtis@xiphis.org
4e2c63a7ba Merge bk-internal:/home/bk/mysql-5.1-new 
into  xiphis.org:/home/acurtis/mysql-5.1-merge
 2006-05-12 17:40:58 -07:00
ngrishakin@mysql.com
5caf8bc77b Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new
 2006-05-13 01:32:24 +02:00
ngrishakin@mysql.com
e4497ace5f .del-ndb_partition_range.result~17fc1db754d4153d: 
Delete: mysql-test/r/ndb_partition_range.result
.del-ndb_partition_list.result~7af68cd45e74abf:
  Delete: mysql-test/r/ndb_partition_list.result
.del-ndb_partition_key.result~68b9a59cff8c9840:
  Delete: mysql-test/r/ndb_partition_key.result
.del-ndb_partition_error.result~944f84894e323e9:
  Delete: mysql-test/r/ndb_partition_error.result
.del-ndb_blob_partition.result~fda88ddfc5477a7e:
  Delete: mysql-test/r/ndb_blob_partition.result
.del-ndb_partition_range.test~af8f9016b6648239:
  Delete: mysql-test/t/ndb_partition_range.test
.del-ndb_partition_list.test~940289b3d58595ca:
  Delete: mysql-test/t/ndb_partition_list.test
.del-ndb_partition_key.test~ed7b15c91f66558d:
  Delete: mysql-test/t/ndb_partition_key.test
.del-ndb_partition_error.test~2da477be29be041f:
  Delete: mysql-test/t/ndb_partition_error.test
.del-ndb_blob_partition.test~ea99ef9759705ce3:
  Delete: mysql-test/t/ndb_blob_partition.test
 2006-05-13 01:30:44 +02:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
ab63f5d072 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 15:47:20 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
640a4de065 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 15:44:15 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
cb28572558 merge 2006-05-12 15:41:46 -04:00
acurtis@xiphis.org
1b8af703a3 fix results after merge 2006-05-12 11:49:35 -07:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c85be97f50 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:22:31 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
c558d9d00d Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19502 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:14:39 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
14bbe2c0ee Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19501 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:11:46 -04:00
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
113cc95f84 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19062 
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
 2006-05-12 12:09:26 -04:00
acurtis@xiphis.org
9ba0ac9579 manual merge bug#10952 2006-05-12 08:50:31 -07:00
jmiller@mysql.com
e9056d856d Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-05-12 14:28:16 +02:00
jmiller@mysql.com
375473ed95 rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test: 
Updated per lars
rpl_row_flsh_tbls.test:
  updated per lars
 2006-05-12 14:09:13 +02:00
msvensson@neptunus.(none)
9f5c15cfa8 Merge bk-internal:/home/bk/mysql-5.1-new 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 11:51:04 +02:00
aelkin@mysql.com
96ca030940 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.1-bug19728_regex_win
 2006-05-12 12:40:56 +03:00
aelkin@mysql.com
f7f83cd04c Bug#19728: Test mysqldump failure 
regex is fixed for windows.
 2006-05-12 12:32:44 +03:00
msvensson@neptunus.(none)
46f1f3ed2c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-md 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 11:19:37 +02:00
msvensson@neptunus.(none)
40bfe246a9 Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
msvensson@neptunus.(none)
de507975fa Fix after merge 5.0->5.1 2006-05-12 09:10:04 +02:00
msvensson@neptunus.(none)
47a578f4e4 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 08:45:22 +02:00
tnurnberg@mysql.com
41c276aa89 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql-5.1-19509.19509
 2006-05-12 06:37:50 +02:00
reggie@linux.site
e672bdc824 removed handlerton-win.cc (again) 2006-05-11 14:46:11 -05:00
jmiller@mysql.com
11d442a1c3 Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
 2006-05-11 21:46:10 +02:00
tnurnberg@mysql.com
742996dc8b Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/mysql-5.1-19509
 2006-05-11 21:46:10 +02:00
reggie@linux.site
aed0fca38a Merge linux.site:/home/reggie/work/mysql-5.1 
into  linux.site:/home/reggie/work/mysql-5.1-test
 2006-05-11 14:46:10 -05:00
sergefp@mysql.com
319ffaf55a Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-merge6
 2006-05-11 23:46:09 +04:00
sergefp@mysql.com
be11ca037a Merge mysql.com:/home/psergey/tmp_merge3 
into  mysql.com:/home/psergey/mysql-5.1-merge6
 2006-05-11 23:40:40 +04:00
reggie@big_geek.
59b3c197a6 Merge reggie@192.168.1.107:/home/reggie/work/mysql-5.1 
into  big_geek.:C:/Work/mysql/mysql-5.1-test
 2006-05-11 14:14:10 -05:00
tim@siva.hindu.god
5b9ecf1e28 Merge siva.hindu.god:/usr/home/tim/m/51/a 
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
 2006-05-11 13:14:10 -06:00
sergefp@mysql.com
431582afbb Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-merge6
 2006-05-11 23:14:09 +04:00
sergefp@mysql.com
e76acd803c Merge mysql.com:/home/psergey/tmp_merge2 
into  mysql.com:/home/psergey/mysql-5.1-merge6
 2006-05-11 20:44:31 +04:00
sergefp@mysql.com
acdc038a44 Bug#19136: Manual 5.0->5.1 merge 2006-05-11 20:41:11 +04:00
reggie@big_geek.
67a692f998 performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1. 
This is being pushed to a private tree and tested before being sent to the mainline.
 2006-05-11 11:29:08 -05:00
jmiller@mysql.com
f1d1c98df6 changes for when NDB is default engine 2006-05-11 18:12:06 +02:00
reggie@big_geek.
3def02edd1 bringing handlerton-win.cc back after incorrectly deleteing it. It is not needed for 5.1 or later but is used by 5.0 2006-05-11 11:06:35 -05:00
sergefp@mysql.com
d2efab4d6f Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  mysql.com:/home/psergey/mysql-5.1-merge5
 2006-05-11 20:06:34 +04:00
sergefp@mysql.com
22c71d3db8 Merge mysql.com:/home/psergey/tmp_merge 
into  mysql.com:/home/psergey/mysql-5.1-merge5
 2006-05-11 18:41:53 +04:00