Commits · 81aa1ca0a0203af2d120c2d286cbc62bb4b68001 · nexedi / MariaDB

10 Apr, 2007 2 commits

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

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

81aa1ca0

ndb - bug#27728 (5.1) · eaff83cb

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

eaff83cb

05 Apr, 2007 26 commits

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

483ce953

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

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

68fa01f0

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


sql/item_func.cc:
  Auto merged
```
23e92aca

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

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

34dcbe66

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

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

4025df92

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


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

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

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

ee59e734

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

a3d8d943

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

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

f7143ac3

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

Add extra INSERT to make usre sync_slave_with_master has job to do · c66a1528

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.

c66a1528

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

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

499d058c

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


sql/item_func.cc:
  Auto merged
```
865cd010

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

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

0679e0a6

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

unknown authored Apr 05, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged

b8ea75c8

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


sql/ha_ndbcluster.cc:
  Auto merged
```
73748930
Removed compiler warnings · cfe2d1da
unknown authored Apr 05, 2007

cfe2d1da
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 · 33ad8991
unknown authored Apr 05, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/sql_trigger.h:
  Auto merged
```
33ad8991
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 22c188fe
unknown authored Apr 05, 2007
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/sql_trigger.h:
  Auto merged
```
22c188fe
Fixed compilation error on Windows · 4c0f3c50
unknown authored Apr 05, 2007

4c0f3c50

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

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

02a7bdc4

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

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

bb8fb9e9

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

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

d5c744d2

04 Apr, 2007 12 commits

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

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 · 8bbbff63

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

8bbbff63

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

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).

a0c4e184

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

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

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

821355da

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

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

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

7279edc7

Merge from 5.0 · 59a64c2b

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

59a64c2b

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

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

22e2ca54

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

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

655a58d8