Commits · 5e1078b645575d476d541ca7962b7cfae76b46cc · nexedi / MariaDB

14 Dec, 2007 3 commits
- Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge · 5e1078b6
  unknown authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/mysqld.cc:
  Auto merged
```
  5e1078b6
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 127373be
  unknown authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/mysqld.cc:
  Auto merged
```
  127373be
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · a3fed7de
  unknown authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge


sql/mysqld.cc:
  Auto merged
```
  a3fed7de
13 Dec, 2007 24 commits

Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1 · 051108c8
unknown authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
051108c8
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 62655f92
unknown authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
62655f92

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

unknown authored Dec 13, 2007

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


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

e8737ccc

Bug #33168 Incorrectly handled parameters can make the TC crash during node failure · 2afe44f2
unknown authored Dec 13, 2007
```
- during commit deadlock timeout needs to be at least 5 times db hearbeat
```
2afe44f2

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 44f1375f

unknown authored Dec 13, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


storage/blackhole/ha_blackhole.cc:
  use local

44f1375f

additional fix · 25119578
unknown authored Dec 13, 2007

25119578

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 4ffd3a5c

unknown authored Dec 13, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


storage/blackhole/ha_blackhole.cc:
  use local

4ffd3a5c

additional after merge fix · 115c6390

unknown authored Dec 13, 2007


mysql-test/r/partition_range.result:
  removed fix for bug#30573
mysql-test/suite/parts/r/rpl_partition.result:
  updated result file
mysql-test/t/partition_range.test:
  removed test case for bug#30573
sql/ha_partition.cc:
  removed fix for bug#30573

115c6390

valgrind error fix · f104ab2d
unknown authored Dec 13, 2007

f104ab2d
after merge fix · 9de3564d
unknown authored Dec 13, 2007

9de3564d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · c7d62b45
unknown authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
c7d62b45
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · f5f44d0e
unknown authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
f5f44d0e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 690e7b09
unknown authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
```
690e7b09
after merge fix · 22333974
unknown authored Dec 13, 2007

22333974

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 77784d57

unknown authored Dec 13, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/range.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
mysql-test/include/mix1.inc:
  manual merge
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/r/range.result:
  manual merge
sql/item_cmpfunc.cc:
  manual merge

77784d57

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · a07da3ce

unknown authored Dec 13, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/type_date.result:
  Auto merged
mysql-test/suite/rpl/r/rpl_innodb_bug28430.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_date.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/queues.c:
  Auto merged
sql/events.cc:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_partition.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/ha_myisam.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/lib/mtr_report.pl:
  manual merge
mysql-test/r/myisam.result:
  manual merge
mysql-test/r/partition.result:
  manual merge
mysql-test/r/user_var.result:
  manual merge
mysql-test/t/myisam.test:
  manual merge
mysql-test/t/partition.test:
  manual merge
mysql-test/t/user_var.test:
  manual merge
sql/item.h:
  manual merge
sql/item_func.cc:
  manual merge
storage/myisammrg/ha_myisammrg.cc:
  manual merge

a07da3ce

after merge fix · 72bdad35
unknown authored Dec 13, 2007

72bdad35

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

unknown authored Dec 13, 2007

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


storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged

87193121

Bug #33206 signal not reset properly in ndb · 30119155
unknown authored Dec 13, 2007

30119155

Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · 74edf075

unknown authored Dec 13, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


include/mysql_com.h:
  Auto merged
myisam/mi_check.c:
  Auto merged

74edf075

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 16e05a49

unknown authored Dec 13, 2007

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql_com.h:
  Auto merged
libmysql/CMakeLists.txt:
  Auto merged
myisam/mi_check.c:
  Auto merged
mysql-test/r/delayed.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/func_misc.result:
  manual merge
mysql-test/r/innodb_mysql.result:
  manual merge
mysql-test/t/func_misc.test:
  manual merge
mysql-test/t/innodb_mysql.test:
  manual merge
sql/sql_insert.cc:
  manual merge

16e05a49

Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · c79da1d2
unknown authored Dec 13, 2007
```
into  mysql.com:/home/psergey/mysql-5.0-bug32198
```
c79da1d2

BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly · 4c56d1af

unknown authored Dec 13, 2007

- Make conditions like "date_col $CMP$ 'datetime-const'" range-sargable


mysql-test/r/range.result:
  BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
  - Testcase
mysql-test/t/range.test:
  BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
  - Testcase
sql/field.cc:
  BUG#32198: Comparison of DATE with DATETIME still not using indexes correctly
  - Added comments

4c56d1af

Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 06122a05

unknown authored Dec 13, 2007

into  mysql.com:/home/gluh/MySQL/Merge/4.1-opt


include/mysql_com.h:
  Auto merged
myisam/mi_check.c:
  Auto merged

06122a05

12 Dec, 2007 2 commits
- Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 3ecf3a78
  unknown authored Dec 12, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/t/merge.test:
  Auto merged
```
  3ecf3a78
- Dummy push to help pushbuild running again. · e50fee04
  unknown authored Dec 12, 2007
```
Fixed case of comment.


mysql-test/t/merge.test:
  Fixed case of comment.
```
  e50fee04
11 Dec, 2007 11 commits

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 2f2c2db2
unknown authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
2f2c2db2
Merge stella.local:/home2/mydev/mysql-5.1-amain · d88c032d
unknown authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
d88c032d
Merge stella.local:/home2/mydev/mysql-5.1-ateam · fb739da4
unknown authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg


sql/sql_table.cc:
  Auto merged
```
fb739da4
Merge stella.local:/home2/mydev/mysql-5.0-amain · 69113376
unknown authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
69113376
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 2ad20543
unknown authored Dec 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
```
2ad20543

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 747882ae

unknown authored Dec 11, 2007

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/r/func_misc.result:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged

747882ae

Merge stella.local:/home2/mydev/mysql-5.1-bug30273 · 4f540b61

unknown authored Dec 11, 2007

into  stella.local:/home2/mydev/mysql-5.1-axmrg


sql/lock.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged

4f540b61

Merge stella.local:/home2/mydev/mysql-5.1-amain · d1b4b680

unknown authored Dec 11, 2007

into  stella.local:/home2/mydev/mysql-5.1-axmrg


mysql-test/t/disabled.def:
  Auto merged
sql/partition_info.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
mysql-test/r/func_misc.result:
  SCCS merged
mysql-test/t/func_misc.test:
  SCCS merged

d1b4b680

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 97e6dc78
unknown authored Dec 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
```
97e6dc78
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · cd24657b
unknown authored Dec 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
cd24657b

move randomly failing tests to ndb_team suite · c6d51adf

unknown authored Dec 11, 2007

mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test:
Rename: mysql-test/suite/ndb/t/ndb_dd_backuprestore.test -> mysql-test/suite/ndb_team/t/ndb_dd_backuprestore.test
mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result:
Rename: mysql-test/suite/ndb/r/ndb_dd_backuprestore.result -> mysql-test/suite/ndb_team/r/ndb_dd_backuprestore.result
mysql-test/suite/ndb_team/r/ndb_backup_print.result:
Rename: mysql-test/suite/ndb/r/ndb_backup_print.result -> mysql-test/suite/ndb_team/r/ndb_backup_print.result
mysql-test/suite/ndb_team/t/ndb_backup_print.test:
Rename: mysql-test/suite/ndb/t/ndb_backup_print.test -> mysql-test/suite/ndb_team/t/ndb_backup_print.test

c6d51adf