Commits · 7fcc77f49cf8e3a69583449005751ad5db0708d7 · Kirill Smelkov / mariadb

25 May, 2006 2 commits
- ndb - bug#14509 v5.1 part 2/2 : handler level · 7fcc77f4
  pekka@mysql.com authored May 25, 2006
  
  7fcc77f4
- ndb - bug#14509 v5.1 part 1/2 : ndb api level [requires part 2/2] · 57724650
  pekka@mysql.com authored May 25, 2006
  
  57724650
17 May, 2006 2 commits
- Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 · e1099867
  pekka@mysql.com authored May 17, 2006
```
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
```
  e1099867
- ndb - bug#14509 [related] re-do auto-incr error handling · 54963c2e
  pekka@mysql.com authored May 17, 2006
  
  54963c2e
16 May, 2006 5 commits
- Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 · 8f5467d1
  pekka@mysql.com authored May 16, 2006
```
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
```
  8f5467d1
- ndb - bug#14509 [related] fix a return value · fc732046
  pekka@mysql.com authored May 16, 2006
  
  fc732046
- Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 · 852c0dbf
  pekka@mysql.com authored May 16, 2006
```
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
```
  852c0dbf
- ndb - bug#14509 [related] setAutoIncrement: add error handling · dd58dd51
  pekka@mysql.com authored May 16, 2006
  
  dd58dd51
- Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 · d0d8b6c9
  pekka@mysql.com authored May 16, 2006
```
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
```
  d0d8b6c9
13 May, 2006 4 commits
- Merge mysql.com:/home/psergey/tmp_merge3 · a70bfd6c
  sergefp@mysql.com authored May 13, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge2
```
  a70bfd6c
- fix binlog results · ff71980a
  acurtis@xiphis.org authored May 13, 2006
  
  ff71980a
- fix partition test · a84822af
  acurtis@xiphis.org authored May 12, 2006
  
  a84822af
- Merge bk-internal:/home/bk/mysql-5.1-new · 4e2c63a7
  acurtis@xiphis.org authored May 12, 2006
```
into  xiphis.org:/home/acurtis/mysql-5.1-merge
```
  4e2c63a7
12 May, 2006 21 commits
- Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 5caf8bc7
  ngrishakin@mysql.com authored May 13, 2006
```
into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new
```
  5caf8bc7
- .del-ndb_partition_range.result~17fc1db754d4153d: · e4497ace
  ngrishakin@mysql.com authored May 13, 2006
```
  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
```
  e4497ace
- Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new · ab63f5d0
  mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se authored May 12, 2006
```
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
```
  ab63f5d0
- Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140 · 640a4de0
  mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se authored May 12, 2006
```
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
```
  640a4de0
- merge · cb285725
  mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se authored May 12, 2006
  
  cb285725
- fix results after merge · 1b8af703
  acurtis@xiphis.org authored May 12, 2006
  
  1b8af703
- Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new · c85be97f
  mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se authored May 12, 2006
```
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
```
  c85be97f
- Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19502 · c558d9d0
  mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se authored May 12, 2006
```
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
```
  c558d9d0
- Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19501 · 14bbe2c0
  mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se authored May 12, 2006
```
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
```
  14bbe2c0
- Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19062 · 113cc95f
  mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se authored May 12, 2006
```
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
```
  113cc95f
- manual merge bug#10952 · 9ba0ac95
  acurtis@xiphis.org authored May 12, 2006
  
  9ba0ac95
- Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e9056d85
  jmiller@mysql.com authored May 12, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
  e9056d85
- rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test: · 375473ed
  jmiller@mysql.com authored May 12, 2006
```
  Updated per lars
rpl_row_flsh_tbls.test:
  updated per lars
```
  375473ed
- Merge bk-internal:/home/bk/mysql-5.1-new · 9f5c15cf
  msvensson@neptunus.(none) authored May 12, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  9f5c15cf
- Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 96ca0309
  aelkin@mysql.com authored May 12, 2006
```
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.1-bug19728_regex_win
```
  96ca0309
- Bug#19728: Test mysqldump failure · f7f83cd0
  aelkin@mysql.com authored May 12, 2006
```
regex is fixed for windows.
```
  f7f83cd0
- Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-md · 46f1f3ed
  msvensson@neptunus.(none) authored May 12, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  46f1f3ed
- Rename cmakelists.txt -> CMakeLists.txt · 40bfe246
  msvensson@neptunus.(none) authored May 12, 2006
  
  40bfe246
- Fix after merge 5.0->5.1 · de507975
  msvensson@neptunus.(none) authored May 12, 2006
  
  de507975
- Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge · 47a578f4
  msvensson@neptunus.(none) authored May 12, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
  47a578f4
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 41c276aa
  tnurnberg@mysql.com authored May 12, 2006
```
into  mysql.com:/home/mysql-5.1-19509.19509
```
  41c276aa
11 May, 2006 6 commits
- removed handlerton-win.cc (again) · e672bdc8
  reggie@linux.site authored May 11, 2006
  
  e672bdc8
- Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 11d442a1
  jmiller@mysql.com authored May 11, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
  11d442a1
- Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 742996dc
  tnurnberg@mysql.com authored May 11, 2006
```
into  mysql.com:/home/mysql-5.1-19509
```
  742996dc
- Merge linux.site:/home/reggie/work/mysql-5.1 · aed0fca3
  reggie@linux.site authored May 11, 2006
```
into  linux.site:/home/reggie/work/mysql-5.1-test
```
  aed0fca3
- Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 319ffaf5
  sergefp@mysql.com authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6
```
  319ffaf5
- Merge mysql.com:/home/psergey/tmp_merge3 · be11ca03
  sergefp@mysql.com authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6
```
  be11ca03