Commits · bff93cbe6c209140a62da7d173ef6da25c3c2820 · nexedi / MariaDB

12 May, 2006 13 commits

merge · bff93cbe
unknown authored May 12, 2006

bff93cbe

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

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

2bbda91f

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

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

34e8e53e

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

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

8e1a2d3b

Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19062 · e0132e19
unknown authored May 12, 2006
```
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19010
```
e0132e19
Merge bk-internal:/home/bk/mysql-5.1-new · 22f9cee0
unknown authored May 12, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


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

Bug#19728: Test mysqldump failure · 6f9d4d44

unknown authored May 12, 2006

regex is fixed for windows.


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

6f9d4d44

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

7828e852

Fix after merge 5.0->5.1 · 2bc41fbd

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

2bc41fbd

Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge · 9dd5e128

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

9dd5e128

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

11 May, 2006 18 commits

removed handlerton-win.cc (again) · 8e25368b

unknown authored May 11, 2006


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

8e25368b

Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new · bf9d95fb
unknown authored May 11, 2006
```
into  mysql.com:/home/mysql-5.1-19509
```
bf9d95fb
Merge linux.site:/home/reggie/work/mysql-5.1 · f06af62c
unknown authored May 11, 2006
```
into  linux.site:/home/reggie/work/mysql-5.1-test
```
f06af62c
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 9d671ecf
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6
```
9d671ecf
Merge mysql.com:/home/psergey/tmp_merge3 · e707d315
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6


configure.in:
  Auto merged
```
e707d315
Merge reggie@192.168.1.107:/home/reggie/work/mysql-5.1 · abb2184b
unknown authored May 11, 2006
```
into  big_geek.:C:/Work/mysql/mysql-5.1-test
```
abb2184b
Merge siva.hindu.god:/usr/home/tim/m/51/a · 954a04d3
unknown authored May 11, 2006
```
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
```
954a04d3
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · e8d39321
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge6
```
e8d39321

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

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

a8408dee

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

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

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

8659a971

bringing handlerton-win.cc back after incorrectly deleteing it. It is not... · efe19635

unknown authored May 11, 2006

bringing handlerton-win.cc back after incorrectly deleteing it. It is not needed for 5.1 or later but is used by 5.0

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

efe19635

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1-new · ffb9dbcd
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge5
```
ffb9dbcd
Merge mysql.com:/home/psergey/tmp_merge · de284ead
unknown authored May 11, 2006
```
into  mysql.com:/home/psergey/mysql-5.1-merge5


sql/sql_select.cc:
  Auto merged
```
de284ead
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 87c7bdf6
unknown authored May 11, 2006
```
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
```
87c7bdf6
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new · f446005b
unknown authored May 11, 2006
```
into  mysql.com:/home/mysql-5.1-19509


sql/sql_acl.cc:
  Auto merged
```
f446005b

Merge mysql.com:/home/tomash/src/mysql_ab/tmp_merge · 0f9f8856

unknown authored May 11, 2006

into  mysql.com:/home/tomash/src/mysql_ab/mysql-5.1-merge


BitKeeper/deleted/.del-changelog-4.0.xml~8f56ee8a913e848b:
  Auto merged
BitKeeper/deleted/.del-changelog-4.1.xml~8aa496ebed09d868:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

0f9f8856

Merge siva.hindu.god:/usr/home/tim/m/51/a · 76f8467a
unknown authored May 10, 2006
```
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
```
76f8467a

10 May, 2006 9 commits

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

rpl_log.test: · ca277d58

unknown authored May 11, 2006

  Remove comments not needed


mysql-test/extra/rpl_tests/rpl_log.test:
  Remove comments not needed

ca277d58

rpl_log.test: · 95f6fc9d

unknown authored May 11, 2006

  Correct fix for test bug #19158


mysql-test/extra/rpl_tests/rpl_log.test:
  Correct fix for test bug #19158

95f6fc9d

Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge · 3f8a3981

unknown authored May 10, 2006

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


mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged

3f8a3981

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

unknown authored May 10, 2006

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


BitKeeper/deleted/.del-changelog-5.0.xml~f4c50926ccdd7434:
  Auto merged
mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/util/NdbSqlUtil.hpp:
  Auto merged
storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged

c3ee901a

Add missing drop table · 87572bc9
unknown authored May 10, 2006

87572bc9
Update test results for 5.1 · 3a5a54a8
unknown authored May 10, 2006

3a5a54a8
Merge siva.hindu.god:/usr/home/tim/m/51/a · d77297dd
unknown authored May 10, 2006
```
into  siva.hindu.god:/usr/home/tim/m/51/a.bug6061
```
d77297dd
Merge bk-internal:/home/bk/mysql-5.1-new · f92b754f
unknown authored May 10, 2006
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
```
f92b754f