Commits · 271bafb0445daebeef402832c5392d50777217c7 · nexedi / MariaDB

14 Dec, 2007 1 commit
- Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-opt · 271bafb0
  unknown authored Dec 14, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge


sql/mysqld.cc:
  Auto merged
```
  271bafb0
13 Dec, 2007 21 commits

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

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

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

ae2f7483

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

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

unknown authored Dec 13, 2007

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


storage/blackhole/ha_blackhole.cc:
  use local

35742460

additional fix · 12504d90
unknown authored Dec 13, 2007

12504d90

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

unknown authored Dec 13, 2007

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


storage/blackhole/ha_blackhole.cc:
  use local

ab088404

additional after merge fix · f61f5f72

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

f61f5f72

valgrind error fix · e51e6097
unknown authored Dec 13, 2007

e51e6097
after merge fix · 0cc269da
unknown authored Dec 13, 2007

0cc269da
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 2c20ba5a
unknown authored Dec 13, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
```
2c20ba5a
after merge fix · f7f96cd2
unknown authored Dec 13, 2007

f7f96cd2

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 214ea206

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

214ea206

Merge mysql.com:/home/gluh/MySQL/Merge/5.1 · 9a10c20b

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

9a10c20b

after merge fix · f1d98054
unknown authored Dec 13, 2007

f1d98054

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

unknown authored Dec 13, 2007

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


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

7870d0a7

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

cdca0af7

Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt · 4618000b

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

4618000b

Merge mysql.com:/home/gluh/MySQL/Merge/5.0 · 33f82b17

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

33f82b17

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

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

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

c6675cd1

Merge mysql.com:/home/gluh/MySQL/Merge/4.1 · 618cb7a8

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

618cb7a8

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


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


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

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 573353c2
unknown authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
573353c2
Merge stella.local:/home2/mydev/mysql-5.1-amain · d538409a
unknown authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg
```
d538409a
Merge stella.local:/home2/mydev/mysql-5.1-ateam · 223e57de
unknown authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.1-axmrg


sql/sql_table.cc:
  Auto merged
```
223e57de
Merge stella.local:/home2/mydev/mysql-5.0-amain · 6f568e0a
unknown authored Dec 11, 2007
```
into  stella.local:/home2/mydev/mysql-5.0-axmrg
```
6f568e0a
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb · 12715737
unknown authored Dec 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
```
12715737

Merge stella.local:/home2/mydev/mysql-5.0-axmrg · 961e5d3d

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

961e5d3d

Merge stella.local:/home2/mydev/mysql-5.1-bug30273 · 82af0276

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

82af0276

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

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

19c7e2c9

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1 · 60afc726
unknown authored Dec 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
```
60afc726
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0 · 82fd9d10
unknown authored Dec 11, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
82fd9d10

move randomly failing tests to ndb_team suite · 87d8e15b

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

87d8e15b

add capability to run certain testsuites optionally depending on name of clone · 3e7ec7cf
unknown authored Dec 11, 2007

3e7ec7cf
remove memleak cased by dynamic variables being lost · 841600c0
unknown authored Dec 11, 2007

841600c0
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0 · 6e58bd40
unknown authored Dec 11, 2007
```
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1


configure.in:
  merge fix
```
6e58bd40
No we're still at 5.0.54. · b56d3824
unknown authored Dec 11, 2007

b56d3824

Merge stella.local:/home2/mydev/mysql-5.0-amain · cd34354e

unknown authored Dec 11, 2007

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


mysql-test/r/func_misc.result:
  Manual merge
mysql-test/t/func_misc.test:
  Manual merge

cd34354e