Commits · f4c7c71003e1114b9caee0c95356875ab473ebb3 · nexedi / MariaDB

10 Apr, 2007 2 commits

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

unknown authored Apr 10, 2007

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


storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

f4c7c710

ndb - bug#27728 (5.1) · 1584ee92

unknown authored Apr 10, 2007

  Make sure API is connected to nodes when subscribing


storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
  new error code
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  make sure API is connected in SUB_START_REQ
storage/ndb/src/ndbapi/ndberror.c:
  new error code

1584ee92

05 Apr, 2007 26 commits

ndb: change attribute id for ANY_VALUE as id was already reserved for upcoming read pached patch · 6d620b67
unknown authored Apr 05, 2007

6d620b67

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

unknown authored Apr 05, 2007

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


include/my_base.h:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  manual merge

837de984

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · d389cae6
unknown authored Apr 05, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


sql/item_func.cc:
  Auto merged
```
d389cae6

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

unknown authored Apr 05, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

f243618a

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · 031bbc0d

unknown authored Apr 05, 2007

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


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/rpl_ndb_basic.result:
  Auto merged
mysql-test/r/rpl_ndb_log.result:
  Auto merged
sql/mysqld.cc:
  Auto merged

031bbc0d

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · abe6457e
unknown authored Apr 05, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
abe6457e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 8f7676b9
unknown authored Apr 05, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
```
8f7676b9
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 160ca673
unknown authored Apr 05, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
160ca673
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · fe7ce4f7
unknown authored Apr 05, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
fe7ce4f7

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

unknown authored Apr 05, 2007

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


storage/ndb/tools/delete_all.cpp:
  Auto merged
storage/ndb/tools/desc.cpp:
  Auto merged
storage/ndb/tools/drop_index.cpp:
  Auto merged
storage/ndb/tools/drop_tab.cpp:
  Auto merged
storage/ndb/tools/listTables.cpp:
  Auto merged
storage/ndb/tools/select_all.cpp:
  Auto merged
storage/ndb/tools/select_count.cpp:
  Auto merged

26233fec

set name for ndb tools · d1d8725e
unknown authored Apr 05, 2007

d1d8725e

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

unknown authored Apr 05, 2007

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


mysql-test/t/ndb_autodiscover3.test:
  Auto merged

98e16c03

Bug#27644 ndb: connecting api node/mysqld may "steal" node_id from running mysqld · fee63615
unknown authored Apr 05, 2007
```
- test case workaround to avoid random failures
```
fee63615

Add extra INSERT to make usre sync_slave_with_master has job to do · 8aa155e9

unknown authored Apr 05, 2007


mysql-test/r/rpl_ssl.result:
  Add an extra INSERT to make sure that the "sync_slave_with_master" has
  someghing to do and thus have to wait for the slave IO thread
  to start.
mysql-test/t/rpl_ssl.test:
  Add an extra INSERT to make sure that the "sync_slave_with_master" has
  someghing to do and thus have to wait for the slave IO thread
  to start.

8aa155e9

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 5371c9fe

unknown authored Apr 05, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


include/my_base.h:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge

5371c9fe

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb · 3ae2a0a8
unknown authored Apr 05, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb


sql/item_func.cc:
  Auto merged
```
3ae2a0a8

Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb · bcf17985

unknown authored Apr 05, 2007

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge


sql/ha_ndbcluster.cc:
  Auto merged

bcf17985

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · ac6a8ba0

unknown authored Apr 05, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged

ac6a8ba0

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 4ebb9b68
unknown authored Apr 05, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
```
4ebb9b68
Removed compiler warnings · ba96395e
unknown authored Apr 05, 2007

ba96395e
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 071c9dfd
unknown authored Apr 05, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/sql_trigger.h:
  Auto merged
```
071c9dfd
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 31a45fe8
unknown authored Apr 05, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/sql_trigger.h:
  Auto merged
```
31a45fe8
Fixed compilation error on Windows · aca9196e
unknown authored Apr 05, 2007

aca9196e

Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb · d69a36a9

unknown authored Apr 05, 2007

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

d69a36a9

Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb · fcf8f3d6

unknown authored Apr 05, 2007

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj.merge


sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

fcf8f3d6

Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb · 5f6721a8

unknown authored Apr 05, 2007

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge


sql/handler.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  merge

5f6721a8

04 Apr, 2007 12 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · f826bf0c
unknown authored Apr 04, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
```
f826bf0c

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5cf2c8d4

unknown authored Apr 04, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

5cf2c8d4

Fix a failure of this test case on HP-UX. · 5a9e8872

unknown authored Apr 05, 2007


mysql-test/r/information_schema.result:
  Fix a race in the test case (second attempt).
mysql-test/t/information_schema.test:
  Fix a race in the test case (second attempt).

5a9e8872

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51 · 55eb077d
unknown authored Apr 04, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
```
55eb077d

Bug #27638: slow logging to CSV table inserts bad query_time and lock_time values · 82e10767

unknown authored Apr 04, 2007

When MySQL logged slow query information to a CSV table, it stored the
query_time and lock_time values with an incorrect formula.

If the time was over 59 seconds, this caused incorrect statistics (either the
slow query was not logged, or the time was far from correct).  This change
fixes the method used to store those TIME values in the slow_log table.


mysql-test/r/log_tables-big.result:
  BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/r/log_tables-big.result
mysql-test/t/log_tables-big-master.opt:
  BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/t/log_tables-big-master.opt
mysql-test/t/log_tables-big.test:
  BitKeeper file /benchmarks/ext3/TOSAVE/tsmith/bk/maint/51/mysql-test/t/log_tables-big.test
sql/time.cc:
  initialize all TIME fields (except neg, which may store a
  needed value) in calc_time_from_sec()
sql/log.cc:
  Log_to_csv_event_handler::log_slow(): call store_time() instead of store() for query_time and lock_time
include/my_time.h:
  Add TIME_MAX_VALUE_SECONDS definition

82e10767

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 6a919ed0
unknown authored Apr 04, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
6a919ed0

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 75beeca3

unknown authored Apr 04, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


include/my_base.h:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge

75beeca3

Merge from 5.0 · 36cf3d46

unknown authored Apr 04, 2007


mysql-test/r/ndb_trigger.result:
  Re-generated
sql/mysql_priv.h:
  Merge
sql/sql_insert.cc:
  Merge
sql/sql_load.cc:
  Merge
sql/sql_update.cc:
  Merge

36cf3d46

set name for ndb tools · 26167484
unknown authored Apr 04, 2007

26167484
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 21157f63
unknown authored Apr 04, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
```
21157f63
sync the initialization configuration information between ConfigInfo.cpp and ParamInfo.cpp · b7861524
unknown authored Apr 04, 2007

b7861524

Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · b1a6e2b3

unknown authored Apr 04, 2007

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.h:
  Auto merged
sql/sql_trigger.h:
  Auto merged
mysql-test/r/ndb_trigger.result:
  Using local, will re-generate.
include/my_base.h:
  Merge
mysql-test/t/ndb_trigger.test:
  Merge
sql/ha_ndbcluster.cc:
  Merge
sql/mysql_priv.h:
  Merge
sql/sql_delete.cc:
  Merge
sql/sql_insert.cc:
  Merge
sql/sql_load.cc:
  Merge
sql/sql_update.cc:
  Merge

b1a6e2b3