Commits · 02f31c55b31a92b5669b5b77f6e13068b80fcdf9 · nexedi / MariaDB

16 May, 2006 3 commits

Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 · 02f31c55

unknown authored May 16, 2006

into  mysql.com:/space/pekka/ndb/version/my51-bug14509


storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  use local, weird diff

02f31c55

ndb - bug#14509 [related] setAutoIncrement: add error handling · 0219f8b0

unknown authored May 16, 2006


ndb/include/ndbapi/Ndb.hpp:
  setAutoIncrement: add error handling
ndb/src/ndbapi/Ndb.cpp:
  setAutoIncrement: add error handling
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  setAutoIncrement: add error handling
ndb/tools/restore/consumer_restore.cpp:
  setAutoIncrement: add error handling
sql/ha_ndbcluster.cc:
  setAutoIncrement: add error handling

0219f8b0

Merge mysql.com:/space/pekka/ndb/version/my50-bug14509 · e60119f8

unknown authored May 16, 2006

into  mysql.com:/space/pekka/ndb/version/my51-bug14509


mysql-test/t/ndb_alter_table.test:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.cpp:
  Auto merged
storage/ndb/src/ndbapi/DictCache.hpp:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  manual merge
storage/ndb/include/ndbapi/Ndb.hpp:
  manual merge
storage/ndb/src/ndbapi/Ndb.cpp:
  manual merge [needs more fixes]
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  SCCS merged
storage/ndb/src/ndbapi/Ndbinit.cpp:
  SCCS merged

e60119f8

13 May, 2006 4 commits

Merge mysql.com:/home/psergey/tmp_merge3 · 44de69cf

unknown authored May 13, 2006

into  mysql.com:/home/psergey/mysql-5.1-merge2


mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/opt_range.cc:
  Manual merge

44de69cf

fix binlog results · bd7e4cad
unknown authored May 13, 2006

bd7e4cad
fix partition test · 964e72b6
unknown authored May 12, 2006
```
mysql-test/r/partition.result:
  fix results - bad automerge
```
964e72b6
Merge bk-internal:/home/bk/mysql-5.1-new · 3dd7b034
unknown authored May 12, 2006
```
into  xiphis.org:/home/acurtis/mysql-5.1-merge


sql/sql_table.cc:
  Auto merged
```
3dd7b034

12 May, 2006 21 commits

Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 7a56b6e1

unknown authored May 13, 2006

into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1-new


BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840:
  Auto merged
BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d:
  Auto merged

7a56b6e1

.del-ndb_partition_range.result~17fc1db754d4153d: · a02faddc

unknown 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


BitKeeper/deleted/.del-ndb_blob_partition.test~ea99ef9759705ce3:
  Delete: mysql-test/t/ndb_blob_partition.test
BitKeeper/deleted/.del-ndb_partition_error.test~2da477be29be041f:
  Delete: mysql-test/t/ndb_partition_error.test
BitKeeper/deleted/.del-ndb_partition_key.test~ed7b15c91f66558d:
  Delete: mysql-test/t/ndb_partition_key.test
BitKeeper/deleted/.del-ndb_partition_list.test~940289b3d58595ca:
  Delete: mysql-test/t/ndb_partition_list.test
BitKeeper/deleted/.del-ndb_partition_range.test~af8f9016b6648239:
  Delete: mysql-test/t/ndb_partition_range.test
BitKeeper/deleted/.del-ndb_blob_partition.result~fda88ddfc5477a7e:
  Delete: mysql-test/r/ndb_blob_partition.result
BitKeeper/deleted/.del-ndb_partition_error.result~944f84894e323e9:
  Delete: mysql-test/r/ndb_partition_error.result
BitKeeper/deleted/.del-ndb_partition_key.result~68b9a59cff8c9840:
  Delete: mysql-test/r/ndb_partition_key.result
BitKeeper/deleted/.del-ndb_partition_list.result~7af68cd45e74abf:
  Delete: mysql-test/r/ndb_partition_list.result
BitKeeper/deleted/.del-ndb_partition_range.result~17fc1db754d4153d:
  Delete: mysql-test/r/ndb_partition_range.result

a02faddc

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new · 0490cb5b
unknown authored May 12, 2006
```
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
```
0490cb5b

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19140 · f7190a3e

unknown authored May 12, 2006

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


mysql-test/t/partition.test:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  manual merge
mysql-test/r/partition.result:
  manual merge
mysql-test/t/ndb_partition_key.test:
  manual merge

f7190a3e

merge · b48f2e61
unknown authored May 12, 2006

b48f2e61
fix results after merge · 7937b3e6
unknown authored May 12, 2006

7937b3e6

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new · 0e336304

unknown authored May 12, 2006

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


mysql-test/r/ndb_dd_basic.result:
  Auto merged
mysql-test/r/ndb_partition_key.result:
  Auto merged
mysql-test/t/ndb_partition_key.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged

0e336304

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19502 · b6bb92a2

unknown authored May 12, 2006

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


sql/ha_partition.cc:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

b6bb92a2

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19501 · ef481319

unknown authored May 12, 2006

into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

ef481319

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19062 · 1e135a10
unknown authored May 12, 2006
```
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
```
1e135a10

manual merge bug#10952 · 93c397f9

unknown authored May 12, 2006


mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/sql_table.cc:
  Auto merged

93c397f9

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 19b40124
unknown authored May 12, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
19b40124

rpl_row_basic_11bugs.test, rpl_multi_engine.test, rpl_flsh_tbls.test: · 07f3ca8c

unknown authored May 12, 2006

  Updated per lars
rpl_row_flsh_tbls.test:
  updated per lars


mysql-test/extra/rpl_tests/rpl_flsh_tbls.test:
  Updated per lars
mysql-test/t/rpl_row_flsh_tbls.test:
  updated per lars
mysql-test/t/rpl_multi_engine.test:
  Updated per lars
mysql-test/t/rpl_row_basic_11bugs.test:
  Updated per lars

07f3ca8c

Merge bk-internal:/home/bk/mysql-5.1-new · a8c13c34
unknown authored May 12, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/sql_acl.cc:
  Auto merged
```
a8c13c34
Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 74e7b09c
unknown authored May 12, 2006
```
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.1-bug19728_regex_win
```
74e7b09c

Bug#19728: Test mysqldump failure · e005a5b3

unknown authored May 12, 2006

regex is fixed for windows.


mysql-test/t/mysqldump.test:
  Windows' suffix is accounted.

e005a5b3

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-md · e1827da7
unknown authored May 12, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
e1827da7
Rename cmakelists.txt -> CMakeLists.txt · e8a5d25b
unknown authored May 12, 2006

e8a5d25b

Fix after merge 5.0->5.1 · 144c7622

unknown authored May 12, 2006


client/mysqlimport.c:
  Variable name changed mysql_connection -> mysql
include/violite.h:
  Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd
vio/viosslfactories.c:
  Type changed st_VioSSLAcceptorFd-> sl_VioSSLFd

144c7622

Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge · 16d46c9c

unknown authored May 12, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/std_data/cacert.pem:
  Auto merged
mysql-test/std_data/client-cert.pem:
  Auto merged
mysql-test/std_data/client-key.pem:
  Auto merged
mysql-test/std_data/server-cert.pem:
  Auto merged
mysql-test/std_data/server-key.pem:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
client/client_priv.h:
  Merge 5.0 -> 5.1
include/violite.h:
  Merge 5.0 -> 5.1
mysql-test/Makefile.am:
  Merge 5.0 -> 5.1
mysql-test/t/disabled.def:
  Merge 5.0 -> 5.1
sql/mysqld.cc:
  Merge 5.0 -> 5.1
vio/viossl.c:
  Merge 5.0 -> 5.1
vio/viosslfactories.c:
  Merge 5.0 -> 5.1

16d46c9c

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0e33ad1f
unknown authored May 12, 2006
```
into  mysql.com:/home/mysql-5.1-19509.19509
```
0e33ad1f

11 May, 2006 12 commits

removed handlerton-win.cc (again) · 77dedc31

unknown authored May 11, 2006


BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df:
  Delete: sql/handlerton-win.cc

77dedc31

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 94323301
unknown authored May 11, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
94323301
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e7c70398
unknown authored May 11, 2006
```
into  mysql.com:/home/mysql-5.1-19509
```
e7c70398
Merge linux.site:/home/reggie/work/mysql-5.1 · c58ca1a8
unknown authored May 11, 2006
```
into  linux.site:/home/reggie/work/mysql-5.1-test
```
c58ca1a8
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 06045451
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6
```
06045451
Merge mysql.com:/home/psergey/tmp_merge3 · 9d64fc50
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6


configure.in:
  Auto merged
```
9d64fc50
Merge reggie@192.168.1.107:/home/reggie/work/mysql-5.1 · 1b2c75d4
unknown authored May 11, 2006
```
into  big_geek.:C:/Work/mysql/mysql-5.1-test
```
1b2c75d4
Merge siva.hindu.god:/usr/home/tim/m/51/a · 816e07e8
unknown authored May 11, 2006
```
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
```
816e07e8
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f6c4805f
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6
```
f6c4805f

Merge mysql.com:/home/psergey/tmp_merge2 · c00a5644

unknown authored May 11, 2006

into  mysql.com:/home/psergey/mysql-5.1-merge6


mysql-test/r/rpl_user_variables.result:
  Auto merged
mysql-test/t/having.test:
  Auto merged
mysql-test/t/rpl_user_variables.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

c00a5644

Bug#19136: Manual 5.0->5.1 merge · 704a69eb
unknown authored May 11, 2006
```
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
```
704a69eb

performing a set of bk mv on each CMakeLists.txt file to try and restore the... · 2dce7ff6

unknown authored May 11, 2006

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.


client/CMakeLists.txt:
  Rename: client/cmakelists.txt.tmp -> client/CMakeLists.txt
libmysql/CMakeLists.txt:
  Rename: libmysql/cmakelists.txt.tmp -> libmysql/CMakeLists.txt
libmysqld/CMakeLists.txt:
  Rename: libmysqld/cmakelists.txt.tmp -> libmysqld/CMakeLists.txt
sql/CMakeLists.txt:
  Rename: sql/cmakelists.txt.tmp -> sql/CMakeLists.txt
zlib/CMakeLists.txt:
  Rename: zlib/cmakelists.txt.tmp -> zlib/CMakeLists.txt
extra/CMakeLists.txt:
  Rename: extra/cmakelists.txt.tmp -> extra/CMakeLists.txt
tests/CMakeLists.txt:
  Rename: tests/cmakelists.txt.tmp -> tests/CMakeLists.txt
extra/yassl/CMakeLists.txt:
  Rename: extra/yassl/cmakelists.txt.tmp -> extra/yassl/CMakeLists.txt
extra/yassl/taocrypt/CMakeLists.txt:
  Rename: extra/yassl/taocrypt/cmakelists.txt.tmp -> extra/yassl/taocrypt/CMakeLists.txt
storage/heap/CMakeLists.txt:
  Rename: storage/heap/cmakelists.txt.tmp -> storage/heap/CMakeLists.txt
storage/myisam/CMakeLists.txt:
  Rename: storage/myisam/cmakelists.txt.tmp -> storage/myisam/CMakeLists.txt
storage/myisammrg/CMakeLists.txt:
  Rename: storage/myisammrg/cmakelists.txt.tmp -> storage/myisammrg/CMakeLists.txt
storage/csv/CMakeLists.txt:
  Rename: storage/csv/cmakelists.txt.tmp -> storage/csv/CMakeLists.txt
storage/innobase/CMakeLists.txt:
  Rename: storage/innobase/cmakelists.txt.tmp -> storage/innobase/CMakeLists.txt
server-tools/instance-manager/CMakeLists.txt:
  Rename: server-tools/instance-manager/cmakelists.txt.tmp -> server-tools/instance-manager/CMakeLists.txt
libmysqld/examples/CMakeLists.txt:
  Rename: libmysqld/examples/cmakelists.txt.tmp -> libmysqld/examples/CMakeLists.txt
vio/CMakeLists.txt:
  Rename: vio/cmakelists.txt.tmp -> vio/CMakeLists.txt
dbug/CMakeLists.txt:
  Rename: dbug/cmakelists.txt.tmp -> dbug/CMakeLists.txt
strings/CMakeLists.txt:
  Rename: strings/cmakelists.txt.tmp -> strings/CMakeLists.txt
regex/CMakeLists.txt:
  Rename: regex/cmakelists.txt.tmp -> regex/CMakeLists.txt
mysys/CMakeLists.txt:
  Rename: mysys/cmakelists.txt.tmp -> mysys/CMakeLists.txt
storage/archive/CMakeLists.txt:
  Rename: storage/archive/cmakelists.txt.tmp -> storage/archive/CMakeLists.txt
storage/bdb/CMakeLists.txt:
  Rename: storage/bdb/cmakelists.txt.tmp -> storage/bdb/CMakeLists.txt
storage/blackhole/CMakeLists.txt:
  Rename: storage/blackhole/cmakelists.txt.tmp -> storage/blackhole/CMakeLists.txt
storage/example/CMakeLists.txt:
  Rename: storage/example/cmakelists.txt.tmp -> storage/example/CMakeLists.txt
CMakeLists.txt:
  Rename: cmakelists.txt.tmp -> CMakeLists.txt

2dce7ff6