Commits · 5f67deecd6f33eeb01d366c8434a92526f2fd869 · nexedi / MariaDB

14 Sep, 2007 7 commits

Merge trift2.:/MySQL/M51/mysql-5.1 · 5f67deec

unknown authored Sep 14, 2007

into  trift2.:/MySQL/M51/push-5.1


config/ac-macros/misc.m4:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/rpl_record.cc:
  Auto merged
sql/rpl_rli.h:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged

5f67deec

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · c35035cf

unknown authored Sep 14, 2007

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


sql/log_event.cc:
  Auto merged

c35035cf

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 7d40fbb6
unknown authored Sep 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
7d40fbb6
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 8be8cb00
unknown authored Sep 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
8be8cb00
Merge gleb.loc:/home/uchum/work/bk/5.0-opt · 0df352fc
unknown authored Sep 14, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.1-opt
```
0df352fc
Merge gleb.loc:/home/uchum/work/bk/5.1 · 62ea3ba5
unknown authored Sep 14, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.1-opt
```
62ea3ba5
Merge gleb.loc:/home/uchum/work/bk/5.0 · 2a089503
unknown authored Sep 14, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.0-opt
```
2a089503

13 Sep, 2007 10 commits
- Merge trift2.:/MySQL/M50/tmp-5.0 · d1e6aadb
  unknown authored Sep 13, 2007
```
into  trift2.:/MySQL/M51/tmp-5.1
```
  d1e6aadb
- Merge trift2.:/MySQL/M51/push-5.1 · 3f3ac7e8
  unknown authored Sep 13, 2007
```
into  trift2.:/MySQL/M51/tmp-5.1


config/ac-macros/misc.m4:
  Auto merged
```
  3f3ac7e8
- Merge trift2.:/MySQL/M50/push-5.0 · 31132dc9
  unknown authored Sep 13, 2007
```
into  trift2.:/MySQL/M50/tmp-5.0
```
  31132dc9
- Merge gleb.loc:/home/uchum/work/bk/5.0-opt · a1da57db
  unknown authored Sep 13, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.1-opt


sql/opt_range.cc:
  Auto merged
```
  a1da57db
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 7082c70e
  unknown authored Sep 13, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
```
  7082c70e
- Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · f822dd49
  unknown authored Sep 13, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
  f822dd49
- Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb · e1ce5fc4
  unknown authored Sep 13, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster_cond.cc:
  Auto merged
```
  e1ce5fc4
- bug#27494 An invalid subselect crashes mysql server: Added check for missing arguments · 9fb7fbe7
  unknown authored Sep 13, 2007
  
  9fb7fbe7
- Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · e7bfb500
  unknown authored Sep 13, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.0-opt
```
  e7bfb500
- Merge gleb.loc:/home/uchum/work/bk/5.0-opt · c396e83d
  unknown authored Sep 13, 2007
```
into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
```
  c396e83d
12 Sep, 2007 14 commits

sql_view.cc: · a2d6941b
unknown authored Sep 13, 2007
```
  Post-merge fix.


sql/sql_view.cc:
  Post-merge fix.
```
a2d6941b

Merge gleb.loc:/home/uchum/work/bk/5.1 · c6d0a5e9

unknown authored Sep 13, 2007

into  gleb.loc:/home/uchum/work/bk/5.1-opt


mysql-test/r/sp.result:
  SCCS merged
mysql-test/t/sp.test:
  SCCS merged
sql/sql_lex.h:
  SCCS merged
sql/sql_parse.cc:
  SCCS merged
sql/sql_yacc.yy:
  SCCS merged

c6d0a5e9

Merge gleb.loc:/home/uchum/work/bk/5.0 · c4955bc0

unknown authored Sep 12, 2007

into  gleb.loc:/home/uchum/work/bk/5.0-opt


sql/sql_yacc.yy:
  Auto merged
mysql-test/r/sp.result:
  SCCS merged
mysql-test/t/sp.test:
  SCCS merged

c4955bc0

Better wording in comments · b58f82a5
unknown authored Sep 12, 2007

b58f82a5

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge · 163ab3ff

unknown authored Sep 12, 2007

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


mysql-test/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

163ab3ff

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · d58d2e7a
unknown authored Sep 12, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


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

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 9c24e8be

unknown authored Sep 12, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge


mysql-test/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

9c24e8be

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj · ee28545f

unknown authored Sep 12, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

ee28545f

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 3fd911ee
unknown authored Sep 12, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj


sql/ha_ndbcluster.cc:
  Auto merged
```
3fd911ee
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · ba0d0a9d
unknown authored Sep 12, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj
```
ba0d0a9d
BUG#23354 revert · 5d03c937
unknown authored Sep 12, 2007

5d03c937
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0-opt · a034509c
unknown authored Sep 12, 2007
```
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/opt_range.cc:
  Auto merged
```
a034509c
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge · 46f7fe8a
unknown authored Sep 12, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged
```
46f7fe8a

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 7c69d06a

unknown authored Sep 12, 2007

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge


sql/ha_ndbcluster.cc:
  Auto merged

7c69d06a

11 Sep, 2007 7 commits

Post-merge fixes · 07113476
unknown authored Sep 12, 2007

07113476
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb · 8184c409
unknown authored Sep 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
8184c409
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 7336cb69
unknown authored Sep 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
```
7336cb69
merging · 82ea8295
unknown authored Sep 11, 2007

82ea8295

Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca · ea8c91c9

unknown authored Sep 11, 2007

into  perch.ndb.mysql.com:/home/jonas/src/51-ndb


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/test/src/HugoTransactions.cpp:
  Auto merged
storage/ndb/test/src/Makefile.am:
  merge

ea8c91c9

ndb - bug#30914 · 45cb2e2a
unknown authored Sep 11, 2007
```
  Dont add insert+delete tuple(s) to lcp-keep-list
```
45cb2e2a

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 4ac439a0

unknown authored Sep 11, 2007

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


mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.h:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/rpl_record.cc:
  Auto merged
sql/rpl_rli.h:
  Auto merged
sql/rpl_utility.cc:
  Auto merged
sql/rpl_utility.h:
  Auto merged

4ac439a0

10 Sep, 2007 2 commits

Post-merge fixes · 49d71426
unknown authored Sep 11, 2007

49d71426

Merge mysql.com:/home/psergey/mysql-4.1-bug30385 · 7a482361

unknown authored Sep 11, 2007

into  mysql.com:/home/psergey/mysql-5.0-bug30385


sql/opt_range.cc:
  Auto merged
mysql-test/r/delete.result:
  Manual merge
mysql-test/t/delete.test:
  Manual merge

7a482361