Commits · 24e6e9b9d035c80ecd2d26f3c35ccd221e6d73ce · nexedi / MariaDB

08 Mar, 2007 32 commits

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore · 24e6e9b9

unknown authored Mar 09, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/r/rpl_ndb_log.result:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.hpp:
  manual merge
storage/ndb/tools/restore/restore_main.cpp:
  manual merge

24e6e9b9

Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user · 70de99d0

unknown authored Mar 09, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged
storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged

70de99d0

Update result for 5.1 · 0381f8cf
unknown authored Mar 08, 2007

0381f8cf

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

unknown authored Mar 08, 2007

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


mysql-test/mysql-test-run.pl:
  Auto merged

b4a38b9e

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

unknown authored Mar 08, 2007

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


mysql-test/mysql-test-run.pl:
  Manual merge

d6bd171f

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

unknown authored Mar 08, 2007

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


client/mysql.cc:
  Auto merged
extra/comp_err.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
BUILD/SETUP.sh:
  Use local

eded6783

Fix 6 warnings from win64, where one is a potential bug. · 10ddaa78

unknown authored Mar 08, 2007


sql/event_data_objects.cc:
  Passing time as time_t to function my_time_t requires
  cast to my_time_t since my_time_t are only required to be 32bits.
sql/log.cc:
  Using time_t instead of my_time_t when calculating current_time.
  This is a potential bugfix for problem with mysql_system_db reporting
  slow log as crashed.
sql/sql_show.cc:
  Passing time as time_t to function my_time_t requires
  cast to my_time_t since my_time_t are only required to be 32bits.

10ddaa78

Merge bk-internal:/home/bk/mysql-5.1-new-maint · 90f02ac8

unknown authored Mar 08, 2007

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


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

90f02ac8

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

unknown authored Mar 08, 2007

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


extra/comp_err.c:
  Auto merged
sql/mysqld.cc:
  Auto merged

cc379fff

Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore · 56b937db

unknown authored Mar 08, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore


storage/ndb/include/ndbapi/NdbRecAttr.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  manual merge

56b937db

medium int printout support · 8927dc83
unknown authored Mar 08, 2007

8927dc83
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50 · 3471a8b6
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51


extra/comp_err.c:
  Auto merged
```
3471a8b6

comp_err.c: return ha_checksum from checksum_format_specifier() - more... · 0a5780bc

unknown authored Mar 08, 2007

comp_err.c: return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning

extra/comp_err.c:
return ha_checksum from checksum_format_specifier() - more correct, avoid a compiler warning

0a5780bc

Fix bad merge of mysql_upgrade.c; return to version 1.27 of the file, as after fix for bug 25074 · ef56d39b
unknown authored Mar 08, 2007

ef56d39b

Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore · 91557f1d

unknown authored Mar 08, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore


storage/ndb/tools/restore/restore_main.cpp:
  Auto merged

91557f1d

changed ndb_restore defaults handeling for structured printout · 1fb285db

unknown authored Mar 08, 2007

    extended ndb_restore_print test with tests


mysql-test/r/ndb_restore_print.result:
  extended ndb_restore_print test with tests
mysql-test/t/ndb_restore_print.test:
  extended ndb_restore_print test with tests
ndb/tools/restore/restore_main.cpp:
  changed ndb_restore defaults handeling for structured printout

1fb285db

Merge mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint · 5948063b

unknown authored Mar 08, 2007

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint


storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

5948063b

Merge bk-internal:/home/bk/mysql-5.1-new-ndb · b45970db

unknown authored Mar 08, 2007

into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.1-new-maint


client/sql_string.h:
  Auto merged
storage/myisam/mi_open.c:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged

b45970db

Merge bk-internal:/home/bk/mysql-5.0-ndb · 12df5509
unknown authored Mar 08, 2007
```
into  mysql.com:/data0/mysqldev/users/tomas/mysql-5.0-maint
```
12df5509

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50 · e911ded7

unknown authored Mar 08, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51


scripts/make_binary_distribution.sh:
  Auto merged

e911ded7

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build · 5e85ba7d

unknown authored Mar 08, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51


scripts/make_binary_distribution.sh:
  Auto merged

5e85ba7d

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint · fc0d8af8
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/51
```
fc0d8af8

Merge poseidon.mysql.com:/home/tomas/mysql-5.1 · 57097f69

unknown authored Mar 08, 2007

into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged

57097f69

Merge poseidon.mysql.com:/home/tomas/mysql-5.0 · 02fa7a16
unknown authored Mar 08, 2007
```
into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
```
02fa7a16
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint · 1d07e346
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
```
1d07e346

new apply_status table test adoption · 26076b6e

unknown authored Mar 08, 2007

new apply_status table ndb_restore adoption


mysql-test/r/ndb_restore_compat.result:
  new apply_status table test adoption
mysql-test/r/rpl_ndb_log.result:
  new apply_status table test adoption
mysql-test/r/rpl_truncate_7ndb.result:
  new apply_status table test adoption
storage/ndb/tools/restore/consumer_restore.cpp:
  new apply_status table ndb_restore adoption

26076b6e

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/misc/51-fedfix · 93d87872
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/51
```
93d87872

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/50 · b818a501

unknown authored Mar 08, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage1/51


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

b818a501

Bug #26940: CREATE SERVER does not initialize record[0] in insert_server_record() · 441cae69

unknown authored Mar 08, 2007

sql_servers.cc:insert_server_record(): initialize record[0] before inserting row

sql/sql_servers.cc:
sql_servers.cc:insert_server_record(): initialize record[0] before inserting row

441cae69

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41 · 270f20ae
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50
```
270f20ae
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/40 · f2044997
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
```
f2044997

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build · 8a01882a

unknown authored Mar 08, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/50


scripts/make_binary_distribution.sh:
  Auto merged

8a01882a

07 Mar, 2007 8 commits

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-build · ae8cad44
unknown authored Mar 08, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mar07/stage2/41
```
ae8cad44

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51 · e7362d5c

unknown authored Mar 08, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51


mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged

e7362d5c

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50 · 9baec333

unknown authored Mar 07, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51


BitKeeper/deleted/.del-bdb_gis.result:
  Use local

9baec333

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 · 30c1622e

unknown authored Mar 07, 2007

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/50


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

30c1622e

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/40 · 7a512b02
unknown authored Mar 07, 2007
```
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/40
```
7a512b02
update test results for bdb_gis after merge of fix for b26038 · 5501a291
unknown authored Mar 07, 2007

5501a291
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build · 656d0b2c
unknown authored Mar 07, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
656d0b2c
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1 · 5125af62
unknown authored Mar 07, 2007
```
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
```
5125af62