Commits · 05fae38812991e0b6392ebbf9f58ae9d8b29c68b · nexedi / MariaDB

04 Dec, 2006 5 commits

Merge bk-internal:/home/bk/mysql-5.1 · 05fae388

unknown authored Dec 04, 2006

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged

05fae388

Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0 · c625dfe7

unknown authored Dec 04, 2006

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1


mysql-test/r/type_varchar.result:
  Auto merged
mysql-test/t/type_varchar.test:
  Auto merged
sql/item_func.cc:
  Auto merged

c625dfe7

Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt · d4bedc87
unknown authored Dec 04, 2006
```
into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0


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

type_varchar.result: · 677a86ca

unknown authored Dec 04, 2006

  fixed a valgrind problem


mysql-test/r/type_varchar.result:
  fixed a valgrind problem

677a86ca

item_func.cc: · 050d9de6

unknown authored Dec 04, 2006

   fixed a valgrind warning
type_varchar.test:
  fixed a valgrind warning


mysql-test/t/type_varchar.test:
  fixed a valgrind warning
sql/item_func.cc:
   fixed a valgrind warning

050d9de6

03 Dec, 2006 1 commit

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 3742e4e4

unknown authored Dec 03, 2006

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


mysql-test/mysql-test-run.pl:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/table.cc:
  Auto merged

3742e4e4

02 Dec, 2006 7 commits

Makefile.am: · c172e138

unknown authored Dec 03, 2006

  Disabled abi_check, as it was before merge


include/Makefile.am:
  Disabled abi_check, as it was before merge

c172e138

Merge mysql.com:/home/kent/bk/mysql-5.0-build · 2c4b27b0

unknown authored Dec 02, 2006

into  mysql.com:/home/kent/bk/mysql-5.1-build


Makefile.am:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged

2c4b27b0

mysql_install_db.sh: · ca3e99d8

unknown authored Dec 02, 2006

  If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)
mysql_install_db.sh:
  Added --srcdir=DIR option, used from top Makefile.am in dist-hook
  target, to find "fill_help_tables.sql" in VPATH build (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)


scripts/mysql_install_db.sh:
  If --srcdir and --windows is given, check if error message file
  is in source or build tree (bug#24557)
Makefile.am:
  Work around problem with "distcleancheck", "sql_yacc.cc" might be in both
  the source and build tree.
  Call "mysql_install_db" with new option --srcdir, to enable the script
  to find all that is needed, if source and build directory is not the same
  (bug#24557)
include/Makefile.am:
  Cleaned up "ali_check" target, to satisfy "distcleancheck" (bug#24557)

ca3e99d8

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build · d3208410
unknown authored Dec 02, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build
```
d3208410
Merge mysql.com:/home/kent/bk/mysql-5.0-build · 8b49ec3a
unknown authored Dec 02, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build
```
8b49ec3a

Makefile.am: · bc6e2e9f

unknown authored Dec 02, 2006

  Added "mysql_client_test.def"
mysql_client_test.def:
  BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def


netware/mysql_client_test.def:
  BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_client_test.def
netware/Makefile.am:
  Added "mysql_client_test.def"

bc6e2e9f

myisampack.def, myisamlog.def, myisam_ftdump.def, myisamchk.def: · f98f1a35

unknown authored Dec 02, 2006

  Adjusted for storage path
nwbootstrap:
  Corrected bad merge


netware/BUILD/nwbootstrap:
  Corrected bad merge
netware/myisam_ftdump.def:
  Adjusted for storage path
netware/myisamchk.def:
  Adjusted for storage path
netware/myisamlog.def:
  Adjusted for storage path
netware/myisampack.def:
  Adjusted for storage path

f98f1a35

01 Dec, 2006 27 commits

Merge mysql.com:/home/kent/bk/mysql-5.0-build · 9ccfa26b
unknown authored Dec 02, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.1-build
```
9ccfa26b
Merge mysql.com:/home/kent/bk/mysql-4.1-build · a882a127
unknown authored Dec 02, 2006
```
into  mysql.com:/home/kent/bk/mysql-5.0-build
```
a882a127

Merge mysql.com:/home/kent/bk/mysql-5.0-build · 3a022237

unknown authored Dec 01, 2006

into  mysql.com:/home/kent/bk/mysql-5.1-build


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/lib/mtr_process.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged

3a022237

mysql_upgrade.def Makefile.am: · ea132547

unknown authored Dec 01, 2006

  Added new "mysql_upgrade.def" for Netware (bug#23504)
*.def:
  Allocate 128K stack for all executables (bug#23504)


netware/comp_err.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/isamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/libmysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/my_print_defaults.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisam_ftdump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamchk.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisamlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/myisampack.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_install_db.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_test_run.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_waitpid.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqladmin.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlbinlog.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlcheck.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqld_safe.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqldump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlimport.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqlshow.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysqltest.def:
  Allocate 128K stack for all executables (bug#23504)
netware/pack_isam.def:
  Allocate 128K stack for all executables (bug#23504)
netware/perror.def:
  Allocate 128K stack for all executables (bug#23504)
netware/replace.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolve_stack_dump.def:
  Allocate 128K stack for all executables (bug#23504)
netware/resolveip.def:
  Allocate 128K stack for all executables (bug#23504)
netware/mysql_upgrade.def:
  BitKeeper file /home/kent/bk/mysql-5.0-build/netware/mysql_upgrade.def
netware/Makefile.am:
  Added "mysql_upgrade.def"

ea132547

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

unknown authored Dec 01, 2006

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


configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/ndb/include/util/OutputStream.hpp:
  Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

e03591c7

Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 751b7b0a
unknown authored Dec 01, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
```
751b7b0a
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb · 2aba358b
unknown authored Dec 01, 2006
```
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
```
2aba358b

Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to... · b97d63a4

unknown authored Dec 01, 2006

Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema

b97d63a4

fix build failure introduced by 5.1-marvel merge · b6d38620
unknown authored Dec 01, 2006
```
include/m_ctype.h:
  update prototype to reflect changes to my_strchr.c
```
b6d38620

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · cdc7797a

unknown authored Dec 01, 2006

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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

cdc7797a

ndb - bug#24655 · 94b35be5

unknown authored Dec 01, 2006

  Handle events "differently" so that dict doesnt get lock too often


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/vm/KeyTable2.hpp:
  Handle event separatly as they dont set block_state :-(

94b35be5

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 2330c5c0

unknown authored Dec 01, 2006

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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

2330c5c0

ndb - bug#24752 · 6dc8ad60

unknown authored Dec 01, 2006

  This prevent any subsequent node restarts, but it's better than crashing an alive node


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix for bug#24752
  This prevent any subsequent node restarts, but it's better than crashing an alive node

6dc8ad60

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marvel · baa96a1a

unknown authored Dec 01, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build


client/mysqltest.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged

baa96a1a

Merge perch.ndb.mysql.com:/home/jonas/src/51-work · 308f2346

unknown authored Dec 01, 2006

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


storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  Auto merged
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

308f2346

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 01a0bec2

unknown authored Dec 01, 2006

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


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged

01a0bec2

ndb - bug#24748 · 8c8e27ba

unknown authored Dec 01, 2006

  Skip rollback if only committedRead in transaction


ndb/src/ndbapi/NdbTransaction.cpp:
  Skip rollback if only committedRead in transaction

8c8e27ba

ndb - bug#24717 · ca99e7f5

unknown authored Dec 01, 2006

  fixes to testprogram to test new impl. in 5.1


storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  move tsman dumps
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  add more support for connection handling using dumps
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  port testprogram to 5.1 to avoid "extra" safety net in LQH

ca99e7f5

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 14e1e7bf

unknown authored Dec 01, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/table.cc:
  Auto merged

14e1e7bf

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1 · fcca7af2
unknown authored Dec 01, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build
```
fcca7af2

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 51df41d1

unknown authored Dec 01, 2006

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


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

51df41d1

Merge bk-internal:/home/bk/mysql-5.1 · 8ac50739

unknown authored Dec 01, 2006

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt


sql/table.cc:
  Auto merged

8ac50739

ndb - · 6a446ee5

unknown authored Dec 01, 2006

  fix merge error


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  fix merge error

6a446ee5

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 71f44704

unknown authored Dec 01, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build


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

71f44704

ndb - · 4723c479

unknown authored Dec 01, 2006

  add testcase for bug#24717
 + fix typo


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Add new error insert 9002
    which is 9000, but will auto enable when started
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  Add new error insert 9002
    which is 9000, but will auto enable when started
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Fix typo
ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase for bug#24717
ndb/test/run-test/daily-basic-tests.txt:
  add testcase for bug#24717

4723c479

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel · 263258d4

unknown authored Dec 01, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


Makefile.am:
  Auto merged
sql-common/my_time.c:
  Auto merged

263258d4

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1 · 29eadca0

unknown authored Dec 01, 2006

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build


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

29eadca0