Commits · 4f36bb01b16f3c3b4a4b923dbe6fe9d20ee3a259 · nexedi / MariaDB

17 Jun, 2006 4 commits

ndb - bug#19285 post merge 5.0->5.1 fix (error codes) · 4f36bb01
unknown authored Jun 17, 2006
```
storage/ndb/src/ndbapi/ndberror.c:
  postmerge fix
```
4f36bb01

Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285 · 03c6f8cb

unknown authored Jun 17, 2006

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


storage/ndb/src/ndbapi/NdbBlob.cpp:
  SCCS merged
storage/ndb/src/ndbapi/ndberror.c:
  use local

03c6f8cb

ndb - bug#19285 minor fixes · 76d2ecea

unknown authored Jun 17, 2006


ndb/src/ndbapi/NdbBlob.cpp:
  bug#19285 minor fixes
ndb/src/ndbapi/ndberror.c:
  bug#19285 minor fixes

76d2ecea

Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285 · 6e0cdd89

unknown authored Jun 17, 2006

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


storage/ndb/include/ndbapi/NdbBlob.hpp:
  manual merge
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  SCCS merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  SCCS merged
storage/ndb/src/ndbapi/NdbBlobImpl.hpp:
  manual merge
storage/ndb/src/ndbapi/ndberror.c:
  use local - add 4275 afterwards
storage/ndb/test/ndbapi/testBlobs.cpp:
  automerge

6e0cdd89

16 Jun, 2006 14 commits

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


sql/log.cc:
  Auto merged
```
0d8d39c8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · a245f597
unknown authored Jun 16, 2006
```
into serg.mylan:/usr/home/serg/Abk/m51
```
a245f597
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
remove wrong assert · 6f160532
unknown authored Jun 16, 2006

6f160532
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

String::set(double) and set(longlong) -> set_real() and set_int() · 0237d9b0
unknown authored Jun 16, 2006
```
fix Field::store(double) being used instead of store(longlong)

NB: overloading functions is evil
```
0237d9b0

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 22 commits

Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 · 2996b49a

unknown authored Jun 15, 2006

into serg.mylan:/usr/home/serg/Abk/m51


mysql-test/r/ctype_sjis.result:
  Auto merged
mysql-test/t/ctype_sjis.test:
  Auto merged
sql/sql_lex.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

2996b49a

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