Commits · 1e56f3768c7fc318e15c47e00528aabd928061c0 · Kirill Smelkov / mariadb

16 Jun, 2006 10 commits

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 1e56f376
unknown authored Jun 16, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
```
1e56f376
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 9479462b
unknown authored Jun 16, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-fix
```
9479462b
Fix for broken compile if not compiling with partitioning · 9224719d
unknown authored Jun 16, 2006

9224719d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 1a7be737
unknown authored Jun 16, 2006
```
into  mysql.com:/Users/emurphy/src/mysql/clean/mysql-5.1
```
1a7be737

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 9addb8fd

unknown authored Jun 16, 2006

into  mysql.com:/home/stewart/Documents/MySQL/5.1/main


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged

9addb8fd

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue · 70cf8240

unknown authored Jun 16, 2006

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged

70cf8240

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/merge-queue · ee1969d2

unknown authored Jun 16, 2006

into  mysql.com:/home/stewart/Documents/MySQL/5.1/main


storage/ndb/include/mgmapi/mgmapi.h:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.hpp:
  Auto merged

ee1969d2

Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main · 61f4440c

unknown authored Jun 16, 2006

into  mysql.com:/home/stewart/Documents/MySQL/5.1/main


mysql-test/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/ndb_condition_pushdown.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/valgrind.supp:
  Manual merge

61f4440c

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

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)

81284709

Fixing false alarm errors on windows build from a clean clone. · 59d38c15

unknown authored Jun 15, 2006


win/build-vs71.bat:
  Don't trigger 'could not find the file specified' errors when 
  running from a clean clone.
win/build-vs8.bat:
  Don't trigger 'could not find the file specified' errors when 
  running from a clean clone.

59d38c15

15 Jun, 2006 23 commits

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · ee69455c
unknown authored Jun 16, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
```
ee69455c
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 9b402b90
unknown authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
9b402b90
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1 · 6d16282f
unknown authored Jun 15, 2006
```
into  c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug20397
```
6d16282f
BUG#19940: Add Valgrind suppression for false alarm report. · 9668198e
unknown authored Jun 15, 2006

9668198e

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

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

1dd45d5c

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


sql/sql_table.cc:
  Review fixes
```
6dd40f3e

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

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

33f38c31

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime · f684f86b

unknown authored Jun 15, 2006

into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap


sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged

f684f86b

Fix for bug#19667 group by a decimal expression yields wrong result · 689205ae

unknown authored Jun 15, 2006


mysql-test/r/type_newdecimal.result:
  Fix for bug#19667 group by a decimal expression yields wrong result
   test case
mysql-test/t/type_newdecimal.test:
  Fix for bug#19667 group by a decimal expression yields wrong result
   test case

689205ae

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 925a53b9
unknown authored Jun 15, 2006
```
into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap
```
925a53b9

Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 48db4010

unknown authored Jun 15, 2006

into  mysql.com:/home/cps/mysql/devel/5.1-csv-remove-mmap


storage/csv/ha_tina.h:
  Auto merged
storage/csv/ha_tina.cc:
  manual merge

48db4010

Merge mysql.com:/home/mydev/mysql-5.1--main · 09617144
unknown authored Jun 15, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-amerge
```
09617144
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · b15981a4
unknown authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
b15981a4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · d7d401ff
unknown authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
d7d401ff
Fixed typo in variable name · ed849efc
unknown authored Jun 15, 2006

ed849efc
Removed stray bracket · 57096e94
unknown authored Jun 15, 2006

57096e94

Merge mysql.com:/home/mydev/mysql-5.0-amerge · 6bc99731

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

6bc99731

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

Merge rurik.mysql.com:/home/igor/tmp_merge · e8288ff9

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

e8288ff9

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · c5644238
unknown authored Jun 15, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
c5644238
Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1 · 1b3ffa03
unknown authored Jun 14, 2006
```
into  xiphis.org:/home/antony/work2/p2-bug20168.4
```
1b3ffa03
merge fixes · 7431df60
unknown authored Jun 14, 2006

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


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

14 Jun, 2006 7 commits

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

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

9467e261

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

7c1748a1
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0 · 23815efc
unknown authored Jun 14, 2006
```
into  devsrv-b.mysql.com:/users/msvensson/mysql-5.0
```
23815efc

Merge xiphis.org:/home/antony/work2/p2-bug20168.2 · 0cbb7421

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

0cbb7421

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


sql/ha_ndbcluster.cc:
  Auto merged
```
23e20da8
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · ddcd816e
unknown authored Jun 14, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
```
ddcd816e