Commits · 6737df4badee359b41ab00b89dc5d8288b8755ea · nexedi / MariaDB

16 Jun, 2006 1 commit

Merge mysql.com:/home/marty/MySQL/mysql-5.0 · 6737df4b

unknown authored Jun 16, 2006

into  mysql.com:/home/marty/MySQL/mysql-5.1


mysql-test/t/ndb_lock.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
mysql-test/r/ndb_lock.result:
  Merge (using local)

6737df4b

15 Jun, 2006 17 commits

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · d22ac2cf
unknown authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
d22ac2cf
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 009941d0
unknown authored Jun 15, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
```
009941d0

Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · 82848e5a

unknown authored Jun 15, 2006

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397


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

82848e5a

BUG#20397: Crash when alter table t1 engine = x; · bd21ce08
unknown authored Jun 15, 2006
```
Review fixes


sql/sql_table.cc:
  Review fixes
```
bd21ce08

don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS · e2eca9bd

unknown authored Jun 15, 2006

don't add CFLAGS/CXXFLAGS to ./configure command line in config.status
but _do_ add them before calling plugins' configure scripts


config/ac-macros/plugins.m4:
  don't call plugins' configure scripts manually, use AC_CONFIG_SUBDIRS

e2eca9bd

Merge mysql.com:/home/mydev/mysql-5.1--main · a3112e72
unknown authored Jun 15, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
a3112e72
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · b1a3b543
unknown authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
b1a3b543
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 946ba2a7
unknown authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
946ba2a7
Fixed typo in variable name · 9be84e4a
unknown authored Jun 15, 2006

9be84e4a
Removed stray bracket · 8be35b5f
unknown authored Jun 15, 2006

8be35b5f

Merge mysql.com:/home/mydev/mysql-5.0-amerge · 18388e3e

unknown authored Jun 15, 2006

into  mysql.com:/home/mydev/mysql-5.1-amerge


mysql-test/r/lock_multi.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Manual merge
sql/ha_myisammrg.h:
  Manual merge

18388e3e

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 28c5f94a
unknown authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
28c5f94a

Merge rurik.mysql.com:/home/igor/tmp_merge · 5c54a8f5

unknown authored Jun 14, 2006

into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0


client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
configure.in:
  Manual merge
mysql-test/r/func_time.result:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge

5c54a8f5

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 11bdf426
unknown authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
11bdf426
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1 · ac752b3d
unknown authored Jun 14, 2006
```
into  xiphis.org:/home/antony/work2/p2-bug20168.4
```
ac752b3d
merge fixes · 2c05f9e8
unknown authored Jun 14, 2006

2c05f9e8
Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · c40bce04
unknown authored Jun 14, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002


sql/ha_ndbcluster.cc:
  Auto merged
```
c40bce04

14 Jun, 2006 22 commits

Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · ec2df63d

unknown authored Jun 14, 2006

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

ec2df63d

merge update · fb58c829
unknown authored Jun 14, 2006
```
mysql-test/t/partition.test:
  merge error
```
fb58c829
cleanup String::set(integer) · cb4fa585
unknown authored Jun 14, 2006

cb4fa585

Merge xiphis.org:/home/antony/work2/p2-bug20168.2 · 1335a185

unknown authored Jun 14, 2006

into  xiphis.org:/home/antony/work2/p2-bug20168.4


mysql-test/r/lock_multi.result:
  Auto merged
sql/handler.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
mysql-test/t/lock_multi.test:
  SCCS merged

1335a185

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 15bace72
unknown authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
```
15bace72

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 · cc0ea3fc

unknown authored Jun 14, 2006

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  manual merge

cc0ea3fc

Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 · a6f561a1
unknown authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


sql/ha_ndbcluster.cc:
  manual merge
```
a6f561a1
Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL · 1020f902
unknown authored Jun 14, 2006
```
- correction of backport error
```
1020f902

Bug #19493 NDB does not ignore duplicate keys when using LOAD DATA LOCAL · 512b77f9

unknown authored Jun 14, 2006

- make sure to disable bulk insert when check for duplicate key is needed


mysql-test/r/ndb_loaddatalocal.result:
  New BitKeeper file ``mysql-test/r/ndb_loaddatalocal.result''
mysql-test/t/ndb_loaddatalocal.test:
  New BitKeeper file ``mysql-test/t/ndb_loaddatalocal.test''

512b77f9

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 28e844f9
unknown authored Jun 14, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
28e844f9
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 · e295aa13
unknown authored Jun 14, 2006
```
into mysql.com:/M51/bug18810-5.1
```
e295aa13
Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M51/bug18810-5.1 · 5dc365d0
unknown authored Jun 14, 2006
```
support-files/mysql.server.sh:
  Auto merged
```
5dc365d0
Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M50/bug18810-5.0 · fb9f3c4e
unknown authored Jun 14, 2006
```
support-files/mysql.server.sh:
  Auto merged
```
fb9f3c4e

support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + bug#20118 · d97dd9a3

unknown authored Jun 14, 2006


support-files/mysql.server.sh:
  Ensure that some necessary / useful system services have been started already,
  when the MySQL server is started. 
  This fixes bug#18810 and bug#20118

d97dd9a3

Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801 · cb029b64

unknown authored Jun 14, 2006

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002


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

cb029b64

Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · d94d81f4

unknown authored Jun 14, 2006

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_partition.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/partition.result:
  manual merge
mysql-test/r/partition_error.result:
  manual merge
mysql-test/r/partition_range.result:
  manual merge
mysql-test/t/partition.test:
  manual merge
mysql-test/t/partition_error.test:
  manual merge
mysql-test/t/partition_range.test:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/partition_element.h:
  manual merge
sql/partition_info.cc:
  manual merge
sql/partition_info.h:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_partition.cc:
  manual merge
sql/sql_table.cc:
  manual merge
sql/table.cc:
  manual merge

d94d81f4

Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1 · 2b4b4776

unknown authored Jun 14, 2006

into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug19801


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

2b4b4776

BUG#19801: Problems with single partition with only NULL allowed in LIST partitioning · 7ba6e9a9
unknown authored Jun 14, 2006
```
After review fix


sql/partition_info.cc:
  After review fix
```
7ba6e9a9
BUG#16002: Unsigned partition function support · 2677332d
unknown authored Jun 14, 2006
```
After review fix


sql/sql_partition.cc:
  After review fix
```
2677332d
Fixed variable description · 026cf694
unknown authored Jun 14, 2006

026cf694
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 2a2b87fe
unknown authored Jun 14, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
2a2b87fe
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 8045a3f3
unknown authored Jun 14, 2006
```
into  mysql.com:/home/marty/MySQL/mysql-5.1


sql/sql_table.cc:
  Auto merged
```
8045a3f3