Commits · 840e08793a07ed957cc2a7b4c3e3db44fd117f8c · Kirill Smelkov / mariadb

06 Sep, 2005 8 commits

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · 840e0879

unknown authored Sep 06, 2005

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


client/mysqltest.c:
  Auto merged
storage/ndb/include/util/ndb_opts.h:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged

840e0879

Merge bk-internal:/home/bk/mysql-5.1 · d03aeb72

unknown authored Sep 06, 2005

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


client/mysqltest.c:
  Auto merged

d03aeb72

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · c29a8d4e
unknown authored Sep 06, 2005
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/t/mysqltest.test:
  Auto merged
```
c29a8d4e

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · cfb7ac76

unknown authored Sep 06, 2005

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


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/include/util/ndb_opts.h:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/tools/Makefile.am:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
ndb/tools/restore/restore_main.cpp:
  Auto merged

cfb7ac76

BUG#12959 mysqltest crashes if testcase passed with -x option · 3ae91695

unknown authored Sep 06, 2005

 - Update test cases


mysql-test/t/mysqltest.test:
  Uncomment the mysqltest -x test. Can't get the output to end up in the result file.

3ae91695

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 · 5ac4b631

unknown authored Sep 06, 2005

into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.1


storage/ndb/include/util/ndb_opts.h:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
storage/ndb/src/kernel/error/ErrorReporter.hpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
storage/ndb/src/mgmsrv/Services.cpp:
  Auto merged
storage/ndb/tools/Makefile.am:
  Auto merged
storage/ndb/tools/ndb_condig.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged

5ac4b631

Merge · f6c1d419

unknown authored Sep 06, 2005


Makefile.am:
  Auto merged
BitKeeper/etc/config:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_federated.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/innobase/include/page0page.ic:
  Auto merged
storage/innobase/include/univ.i:
  Auto merged
storage/innobase/row/row0mysql.c:
  Auto merged
storage/innobase/row/row0sel.c:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_packrec.c:
  Auto merged
storage/myisam/mi_static.c:
  Auto merged
storage/myisam/myisamdef.h:
  Auto merged
storage/myisam/myisampack.c:
  Auto merged
storage/ndb/include/kernel/signaldata/SignalData.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/StartFragReq.hpp:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/StartRec.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp:
  Auto merged
storage/ndb/src/kernel/main.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
sql/log_event.cc:
  SCCS merged
sql/sql_prepare.cc:
  SCCS merged
sql/share/errmsg.txt:
  merge

f6c1d419

Merge · 7b2aacb7

unknown authored Sep 06, 2005


mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
ndb/include/util/ndb_opts.h:
  merge
ndb/tools/Makefile.am:
  merge
ndb/tools/restore/restore_main.cpp:
  merge

7b2aacb7

05 Sep, 2005 24 commits

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · dd45e416

unknown authored Sep 05, 2005

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


client/mysqltest.c:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged
mysql-test/t/func_gconcat.test:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
ndb/src/kernel/error/ErrorReporter.cpp:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.hpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged
ndb/tools/ndb_config.cpp:
  Auto merged
ndb/tools/restore/consumer_restore.cpp:
  Auto merged
mysql-test/t/openssl_1.test:
  Manual merge
ndb/include/util/ndb_opts.h:
  Manual merge
ndb/tools/Makefile.am:
  Manual merge
ndb/tools/restore/restore_main.cpp:
  Manual merge

dd45e416

BUG#12984 mysqltest.test: different output from "exec NonExistsinfComamdn" · 8b1751e5

unknown authored Sep 05, 2005

mysql-test/r/mysqltest.result:
Disable test for failing --exec and --system since output can't be piped to /dev/null on all platforms
mysql-test/t/mysqltest.test:
Disable test for failing --exec and --system since output can't be piped to /dev/null on all platforms
Avoid "echo -e" by using a temporary .sql file for tests that require more than one line.

8b1751e5

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 · 4c8361f6
unknown authored Sep 05, 2005
```
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
```
4c8361f6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1 · 441d80a5
unknown authored Sep 05, 2005
```
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
```
441d80a5

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 · b2d2f188

unknown authored Sep 05, 2005

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


client/mysqltest.c:
  Auto merged

b2d2f188

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · e54b1fd8

unknown authored Sep 05, 2005

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


client/mysqltest.c:
  Auto merged

e54b1fd8

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 · c9415fd4
unknown authored Sep 05, 2005
```
into dl145b.mysql.com:/home/ndbdev/mysql-4.1
```
c9415fd4
Merge neptunus.(none):/home/msvensson/mysql/bug12959/my50-bug12959 · a352fdf8
unknown authored Sep 05, 2005
```
into  neptunus.(none):/home/msvensson/mysql/bug12959/my51-bug12959
```
a352fdf8

Merge neptunus.(none):/home/msvensson/mysql/bug12959/my41-bug12959 · 9fad4fde

unknown authored Sep 05, 2005

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


client/mysqltest.c:
  Auto merged
mysql-test/t/mysqltest.test:
  Auto merged

9fad4fde

Bug#12959 mysqltest crashes if testcase passed with -x option · e10b50e6

unknown authored Sep 05, 2005


client/mysqltest.c:
  Fixes for mysqltest -x  <filename>
mysql-test/t/mysqltest.test:
  Test mysqltest -x <filename>
mysql-test/include/mysqltest-x.inc:
  New BitKeeper file ``mysql-test/include/mysqltest-x.inc''

e10b50e6

added --core-file option to ndb executables · 4a584b17
unknown authored Sep 05, 2005
```
added parseable printout in ndb_restore
```
4a584b17

func_gconcat.test, func_gconcat.result: · 5168730f

unknown authored Sep 05, 2005

  Test case for bug #12859 group_concat in subquery cause incorrect not null.


mysql-test/r/func_gconcat.result:
  Test case for bug #12859 group_concat in subquery cause incorrect not null.
mysql-test/t/func_gconcat.test:
  Test case for bug #12859 group_concat in subquery cause incorrect not null.

5168730f

Merge mysql.com:/usr/home/ram/work/4.1.b4214 · b48e721d

unknown authored Sep 05, 2005

into  mysql.com:/usr/home/ram/work/mysql-5.0


myisam/mi_check.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/mi_static.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
ndb/src/kernel/main.cpp:
  Auto merged
ndb/src/kernel/vm/Emulator.cpp:
  Auto merged
myisam/myisampack.c:
  merging

b48e721d

Bug #12992 Cluster StopOnError = Y restarts ndbd indefinitly · 354fa102
unknown authored Sep 05, 2005

354fa102

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 · 43b04480

unknown authored Sep 05, 2005

into  mysql.com:/usr/home/ram/work/4.1.b4214


myisam/mi_check.c:
  Auto merged
myisam/myisampack.c:
  Auto merged

43b04480

a fix (bug #4214: Table corruption with myisampack and large BLOB objects). · 943f8335

unknown authored Sep 05, 2005


myisam/mi_check.c:
  a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
  - pass version to the save_pack_length().
myisam/mi_packrec.c:
  a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
  - code cleanup: read_pack_length() and calc_pack_length() introduced, 
                  save_pack_length() modified: now the behavior depends on packing version
  - save packing version in the share->pack.version
  - pass it to the read_pack_length()
myisam/mi_static.c:
  a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
  - packing version set to 2
myisam/myisamdef.h:
  a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
  - packing version slot introduced (see MI_PACK)
myisam/myisampack.c:
  a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
  - code cleanup
  - pass version to the calc_pack_length() and save_pack_length()

943f8335

Remove extra ; · e93e346a
unknown authored Sep 05, 2005
```
mysql-test/t/openssl_1.test:
  Remove extra delimiter ;
```
e93e346a

BUG#12983 · a0ea35da

unknown authored Sep 05, 2005

TRASH macro confliciting with TRASH in my_sys.h


mysys/my_alloc.c:
  Rename TRASH to TRASH_MEM and use the TRASH macro from my_sys.h

a0ea35da

Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 · aea2e857
unknown authored Sep 05, 2005

aea2e857
Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0 · 7a0f593d
unknown authored Sep 05, 2005
```
client/mysqltest.c:
  Auto merged
```
7a0f593d

- removed the commercial BK license key from BitKeeper/etc/config to be able to push the · 644a444b

unknown authored Sep 05, 2005

  repository to bkbits.net (License keys should not be put into the repository!)


BitKeeper/etc/config:
  - removed the commercial BK license key to be able to push the repository to bkbits.net

644a444b

added timestamp to shutdown messages in ndbd · 4345853e
unknown authored Sep 05, 2005

4345853e

fixed small bug in ndb redolog printer · 0ef85808

unknown authored Sep 05, 2005

+ added option to dumpe rest of page after exnd of data


ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  fixed small bug in ndb redolog printer
ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  fixed small bug in ndb redolog printer

0ef85808

Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0 · 4773490d
unknown authored Sep 05, 2005
```
into  hundin.mysql.fi:/home/jan/new/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
```
4773490d

04 Sep, 2005 4 commits

row0mysql.c, ha_innodb.cc: · c02509b1

unknown authored Sep 05, 2005

Fix bug #12308 : do not roll back the whhole transaction in a lock wait timeout error, just roll back the latest SQL statement; note that the locks set in the latest SQL statements remain, as InnoDB does not know what locks were set in which SQL statement

sql/ha_innodb.cc:
Fix bug #12308 : do not roll back the whhole transaction in a lock wait timeout error, just roll back the latest SQL statement; note that the locks set in the latest SQL statements remain, as InnoDB does not know what locks were set in which SQL statement
innobase/row/row0mysql.c:
Fix bug #12308 : do not roll back the whhole transaction in a lock wait timeout error, just roll back the latest SQL statement; note that the locks set in the latest SQL statements remain, as InnoDB does not know what locks were set in which SQL statement

c02509b1

This patch disables the query cache for the federated engine. · 7425899f
unknown authored Sep 04, 2005
```
sql/ha_federated.h:
  Fix cache issues
```
7425899f

ha_innodb.cc: · d6b70bf4

unknown authored Sep 04, 2005

  Better comments about auto-inc and SHOW TABLE STATUS


sql/ha_innodb.cc:
  Better comments about auto-inc and SHOW TABLE STATUS

d6b70bf4

ha_innodb.cc: · 53379f98

unknown authored Sep 04, 2005

Fix bug #12973 : set the table handle field auto_increment_value if ::info() is called with the flag HA_STATUS_AUTO

sql/ha_innodb.cc:
Fix bug #12973 : set the table handle field auto_increment_value if ::info() is called with the flag HA_STATUS_AUTO

53379f98

03 Sep, 2005 4 commits

Merge bk-internal:/home/bk/mysql-5.0 · 7f38d440
unknown authored Sep 03, 2005
```
into  mysql.com:/home/jimw/my/mysql-5.0-clean
```
7f38d440

Merge mysql.com:/home/jimw/my/mysql-5.0-11787 · 3eb26b77

unknown authored Sep 03, 2005

into  mysql.com:/home/jimw/my/mysql-5.0-clean


include/mysql.h:
  Auto merged
sql-common/client.c:
  Auto merged
client/mysqltest.c:
  Resolve conflict

3eb26b77

univ.i, page0page.ic: · 8b2b0e24

unknown authored Sep 03, 2005

Add a sanity check to page_rec_is_comp; a new univ.i macro UNIV_RELEASE_NOT_YET_STABLE controls such sanity checks that we will remove after the release is stable enough

innobase/include/page0page.ic:
Add a sanity check to page_rec_is_comp; a new univ.i macro UNIV_RELEASE_NOT_YET_STABLE controls such sanity checks that we will remove after the release is stable enough
innobase/include/univ.i:
Add a sanity check to page_rec_is_comp; a new univ.i macro UNIV_RELEASE_NOT_YET_STABLE controls such sanity checks that we will remove after the release is stable enough

8b2b0e24

row0sel.c: · 80ea9db8

unknown authored Sep 03, 2005

  Fix a wrong debug assert in the previous patch


innobase/row/row0sel.c:
  Fix a wrong debug assert in the previous patch

80ea9db8