Commits · 55403ffb54923e26880fb140296715a95b2dba98 · Kirill Smelkov / mariadb

25 Apr, 2007 6 commits

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

unknown authored Apr 25, 2007

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  merge
storage/ndb/test/tools/Makefile.am:
  merge

55403ffb

ndb - · 59978185

unknown authored Apr 25, 2007

clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  clean up varsize
  by putting varpart ref "inside" fixpart instead of "optionally" at the end

59978185

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · 7f48dfa0
unknown authored Apr 25, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/test/tools/Makefile.am:
  merge
```
7f48dfa0
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca · 868a229c
unknown authored Apr 25, 2007
```
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca


sql/ha_ndbcluster.cc:
  Auto merged
```
868a229c
ndb: added some retry sleep to not get busy loops · 0443044e
unknown authored Apr 25, 2007

0443044e
Bug #28093 ndb: retry sleep in get table stats 30s instead of 30ms · 10b5227b
unknown authored Apr 25, 2007

10b5227b

24 Apr, 2007 3 commits

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca · 85cdadcf

unknown authored Apr 24, 2007

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


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Auto merged

85cdadcf

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 7cf39ee0
unknown authored Apr 24, 2007
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
```
7cf39ee0

ndb - bug#21755 · 55e96b9e

unknown authored Apr 24, 2007

  table/index (es) need special treatment...


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  table/index (es) need special treatment...

55e96b9e

23 Apr, 2007 25 commits

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca · e79f14e1

unknown authored Apr 23, 2007

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


BitKeeper/etc/ignore:
  auto-union
storage/ndb/test/tools/Makefile.am:
  manual merge
storage/ndb/test/tools/listen.cpp:
  manual merge

e79f14e1

new ndb tool to measure replication latency · 21fe9479

unknown authored Apr 23, 2007

BitKeeper/etc/ignore:
Added storage/ndb/test/tools/rep_latency storage/ndb/test/ndbapi/testIndexStat storage/ndb/test/ndbapi/testInterpreter storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2 storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1 storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index to the ignore list
storage/ndb/test/tools/rep_latency.cpp:
New BitKeeper file ``storage/ndb/test/tools/rep_latency.cpp''

21fe9479

simple extend of listen_event to do apply on remote cluster · e8e7b7c0
unknown authored Apr 23, 2007

e8e7b7c0

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint · 818ab28f

unknown authored Apr 23, 2007

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


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged

818ab28f

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 · 0d5a18b5

unknown authored Apr 23, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


BitKeeper/etc/ignore:
  auto-union
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

0d5a18b5

Only list "scripts" once in SUBDIRS · e4a8fd70
unknown authored Apr 23, 2007

e4a8fd70

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

unknown authored Apr 23, 2007

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


storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged

db7a9cf4

ndb - · 42c84459

unknown authored Apr 23, 2007

  add new functions for (easier) using NdbRestarter


storage/ndb/test/include/NdbRestarter.hpp:
  add new functions for (easier) using NdbRestarter

42c84459

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

unknown authored Apr 23, 2007

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


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

64f046bb

ndb - · e14bcb8a

unknown authored Apr 23, 2007

  add (auto) testcase for bug#28023


storage/ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase for bug#28023
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase for bug#28023

e14bcb8a

ndb - bug#28023 (51-main) · 1e086a08

unknown authored Apr 23, 2007

  Add/sub correct offsets (with 2 word varpart ref)


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Add/sub correct offsets (with 2 word varpart ref)

1e086a08

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 08e678c6
unknown authored Apr 23, 2007
```
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


scripts/Makefile.am:
  Auto merged
```
08e678c6

Add "name of struct" as first arg to comp_sql · b44eee2a

unknown authored Apr 23, 2007

Fix "make distcheck"


scripts/CMakeLists.txt:
  Add "name of struct" as first arg to comp_sql
scripts/comp_sql.c:
  Add "name of struct" as first arg to comp_sql

b44eee2a

Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · 6e5abcaf

unknown authored Apr 23, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


Makefile.am:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/r/mysql.result:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

6e5abcaf

Use a temp variable "error" for storing return code of pclose · 09e6e661
unknown authored Apr 23, 2007
```
so the WEXITSTATUS macro can "fiddle" with it as it so pleases
 
```
09e6e661

It's not possible to use the return value of fputs · f1e81f6c

unknown authored Apr 23, 2007

to check if the creation of mysql_upgrade_info suceeded.
Instead use 'upgrade_already_done' to check that file was
created properly.

f1e81f6c

Update test to work also when --pager does not exist in "mysql" · 77d0d996
unknown authored Apr 23, 2007

77d0d996

Merge bk-internal:/home/bk/mysql-5.0-maint · b3e3c388

unknown authored Apr 23, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


Makefile.am:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

b3e3c388

Fix warnings reported by icc · 6a05f2af
unknown authored Apr 23, 2007

6a05f2af
Remove left over file abi_check · 166af98f
unknown authored Apr 23, 2007
```
BitKeeper/deleted/.del-abi_check:
  Delete: include/abi_check
```
166af98f

Remove left over file fix_priv_tabs.result · 18ea5386

unknown authored Apr 23, 2007


BitKeeper/deleted/.del-fix_priv_tabs.result:
  Delete: mysql-test/r/fix_priv_tabs.result

18ea5386

Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint · 984d8e23

unknown authored Apr 23, 2007

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/lib/mtr_process.pl:
  Auto merged

984d8e23

Protect against killing pid's that would "killall" or "kill self" · d19d4b3f
unknown authored Apr 23, 2007

d19d4b3f

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

unknown authored Apr 23, 2007

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


storage/ndb/test/src/HugoTransactions.cpp:
  Auto merged

a1a4e780

ndb - Fix bug in new Hugo equal code (theStatus: 10) · 2d97a6b9
unknown authored Apr 23, 2007
```
storage/ndb/test/src/HugoTransactions.cpp:
  Fix bug in new Hugo equal code
    theStatus: 10
```
2d97a6b9

21 Apr, 2007 5 commits

Merge bk-internal:/home/bk/mysql-5.1 · 2c4ad737
unknown authored Apr 21, 2007
```
into  blade09.mysql.com:/tmp/mmj/mysql-5.1-runtime
```
2c4ad737
test fixed for embedded server · 453ab04b
unknown authored Apr 21, 2007
```
mysql-test/t/sp_trans_log.test:
  test disabled in embedded server
```
453ab04b

Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt · 2cba2651

unknown authored Apr 21, 2007

into  mysql.com:/d2/hf/mrg/mysql-5.1-opt


sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged

2cba2651

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 4272dbed

unknown authored Apr 21, 2007

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/item_cmpfunc.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged

4272dbed

Post-merge fix. · f335e7e4
unknown authored Apr 20, 2007

f335e7e4

20 Apr, 2007 1 commit
- manual merge · b634b55e
  unknown authored Apr 20, 2007
  
  b634b55e