Commits · 0b74fd3163dfa180fcf5f0c8349357139cbb7590 · nexedi / MariaDB

26 Apr, 2006 19 commits

Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0b74fd31
unknown authored Apr 26, 2006
```
into  three.local.lan:/home/matthias/Arbeit/mysql-5.1/src-Bug
```
0b74fd31
Merge mysql.com:/home/mydev/mysql-5.1 · 957937da
unknown authored Apr 26, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-bug18129
```
957937da
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 6186ddf6
unknown authored Apr 26, 2006
```
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug
```
6186ddf6
Merge mysql.com:/home/mydev/mysql-5.1 · f683ae5b
unknown authored Apr 26, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-bug18129
```
f683ae5b
Corrected include path to work under Windows · 1c66e72f
unknown authored Apr 26, 2006

1c66e72f
Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new · eb7c4541
unknown authored Apr 26, 2006
```
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug


mysql-test/t/disabled.def:
  Auto merged
```
eb7c4541
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · a75bc4d3
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
```
a75bc4d3
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 27d9e559
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
```
27d9e559
Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492 · 35a32dfc
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
```
35a32dfc
Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work · 6e3a780f
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work
```
6e3a780f
Make innodb_mysql produce a non-empty output. · a07d3ea2
unknown authored Apr 26, 2006
```
mysql-test/r/innodb_mysql.result:
  Fix result.
```
a07d3ea2
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d0d693b9
unknown authored Apr 26, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
```
d0d693b9
Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work · 2f21ae9f
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work


mysql-test/t/innodb.test:
  Auto merged
```
2f21ae9f
Merge mysql.com:/home/alexi/innodb/mysql-4.1-innodb-work · d763bcfc
unknown authored Apr 26, 2006
```
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work


mysql-test/t/innodb.test:
  Auto merged
```
d763bcfc

Files innodb.[test|result] are to be used by Innobase only. · 5ba3a0c6

unknown authored Apr 26, 2006

 Use files innodb_mysql.[test|result] instead.


mysql-test/t/innodb.test:
  This file is to be used by Innobase only.
mysql-test/r/innodb_mysql.result:
  New BitKeeper file ``mysql-test/r/innodb_mysql.result''
   Use this file instead of innodb.result.
mysql-test/t/innodb_mysql.test:
  New BitKeeper file ``mysql-test/t/innodb_mysql.test''
   Use this file instead of innodb.test.

5ba3a0c6

Applied innodb-5.1-ss492 snapshot. · 9715b42a

unknown authored Apr 26, 2006

 * Fix BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".
 * Remove obsolete and unused variables from srv0srv.c.
 * Remove srv_sys->operational since it is unused.
 * Make thread_id parameter in os_thread_create() optional.
 * Add platform-specific os_thread_ret_t and OS_THREAD_DUMMY_RETURN,
   and convert thread start functions to use them.


storage/innobase/dict/dict0dict.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/dict/dict0load.c:
  Applied innodb-5.1-ss492 snapshot.
   dict_load_indexes(): pass comp=0 to rec_get_deleted_flag(), because
   SYS_INDEXES always is in ROW_FORMAT=REDUNDANT (Bug #19217).
storage/innobase/include/os0thread.h:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/srv0srv.h:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/trx0roll.h:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/include/univ.i:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/log/log0recv.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/os/os0thread.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/que/que0que.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/srv/srv0srv.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/srv/srv0start.c:
  Applied innodb-5.1-ss492 snapshot.
storage/innobase/trx/trx0roll.c:
  Applied innodb-5.1-ss492 snapshot.

9715b42a

disable before investigation why test case for 19170 is failing on · 5e54dd27
unknown authored Apr 26, 2006
```
some platforms.
```
5e54dd27

Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss492-work · 0f7748b1

unknown authored Apr 26, 2006

into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492-work
 Null-merge.


storage/innobase/dict/dict0load.c:
  Null-merge.

0f7748b1

Applied innodb-5.0-ss492 snapshot. · 5f9f7a70

unknown authored Apr 26, 2006

 Fixed BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".


innobase/dict/dict0load.c:
  Applied innodb-5.0-ss492 snapshot.
   dict_load_indexes(): pass comp=0 to rec_get_deleted_flag(), because
   SYS_INDEXES always is in ROW_FORMAT=REDUNDANT (Bug #19217).

5f9f7a70

25 Apr, 2006 21 commits

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 94f85603
unknown authored Apr 26, 2006
```
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
```
94f85603

ndb: break out ndb backup compatability test, so that it can be disabled on mac · 7c34ea03

unknown authored Apr 26, 2006


mysql-test/include/have_case_sensitive_file_system.inc:
  New BitKeeper file ``mysql-test/include/have_case_sensitive_file_system.inc''
mysql-test/r/case_sensitive_file_system.require:
  New BitKeeper file ``mysql-test/r/case_sensitive_file_system.require''
mysql-test/r/ndb_restore_compat.result:
  New BitKeeper file ``mysql-test/r/ndb_restore_compat.result''
mysql-test/t/ndb_restore_compat.test:
  New BitKeeper file ``mysql-test/t/ndb_restore_compat.test''

7c34ea03

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new · d12e33d1
unknown authored Apr 26, 2006
```
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
```
d12e33d1

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-new · e560c8a3

unknown authored Apr 25, 2006

into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new


storage/ndb/src/kernel/vm/Configuration.cpp:
  Auto merged

e560c8a3

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 2fcacd95

unknown authored Apr 25, 2006

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


mysql-test/t/disabled.def:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

2fcacd95

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 0804f782
unknown authored Apr 25, 2006
```
into lmy004.:/work/mysql-5.1-new-clean


mysql-test/t/disabled.def:
  Auto merged
```
0804f782
BUG#17263: incorrect DROP query in temporary tables replication · cdd906b4
unknown authored Apr 25, 2006
```
the fix from 5.0 with necessary modifications applied.


sql/sql_base.cc:
  Manual merge with 5.0.
```
cdd906b4

Merge mysql.com:/home/elkin/MySQL/BARE/5.0 · 2aeb0ae4

unknown authored Apr 25, 2006

into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/case.result:
  Auto merged
mysql-test/r/rpl_temporary.result:
  Auto merged
mysql-test/t/case.test:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
storage/myisam/myisam_ftdump.c:
  Auto merged
sql/sql_base.cc:
  manual merge use local. Another changeset for 5.1 is following.

2aeb0ae4

Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-new · 9c3a7712
unknown authored Apr 25, 2006
```
into  mysql.com:/home/matthias/Arbeit/mysql-5.1/src-Bug


mysql-test/t/disabled.def:
  Auto merged
```
9c3a7712

BUG#19340 small leak in ndbd · 5257dded

unknown authored Apr 25, 2006

small cleanup fixes in kernel/vm/Configuration


ndb/src/kernel/vm/Configuration.cpp:
  clean up m_logLevel
  
  free the connectstring if we allocated one

5257dded

Post merge correction for the Changeset · c92f794c

unknown authored Apr 25, 2006

  Fixes for Bug#12429: Replication tests fail: "Slave_IO_Running" (?) differs related to MySQL 4.1
  and Bug#16920 rpl_deadlock_innodb fails in show slave status (reported for MySQL 5.1)
- Reactivation of testcase rpl_deadlock_innodb + updated file with expected results
- Removal of wrong entry within disabled.def


mysql-test/r/rpl_deadlock_innodb.result:
  Updated result
mysql-test/t/disabled.def:
  - Reactivation of testcase rpl_deadlock_innodb
  - Removal of entry for not existing testcase rpl_until

c92f794c

Post-merge fixes from 5.0. · 0634ff6f

unknown authored Apr 25, 2006


mysql-test/extra/rpl_tests/rpl_insert_id.test:
  Post-merge fix. Added new 5.0 test case manually.
sql/sql_yacc.yy:
  Post-merge fix. Removed GOTO/LABEL from parser.

0634ff6f

reenable ndb_cache2 & ndb_cach_multi2 as I've fixed bug-18597 · ca9d208c
unknown authored Apr 25, 2006

ca9d208c
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new · 8913819b
unknown authored Apr 25, 2006
```
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb


sql/sql_yacc.yy:
  Auto merged
```
8913819b

ndb - · 9571e9e1

unknown authored Apr 25, 2006

  Fix bootstrap/compile error


storage/ndb/tools/restore/restore_main.cpp:
  Fix bootstrap/compile error

9571e9e1

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb · 965e6d7c

unknown authored Apr 25, 2006

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


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

965e6d7c

ndb_restore: more compatablitity checks · 0f9aaddb
unknown authored Apr 25, 2006

0f9aaddb
Merge mysql.com:/home/mydev/mysql-5.1 · bc6dac35
unknown authored Apr 25, 2006
```
into  mysql.com:/home/mydev/mysql-5.1-bug18129


sql/sql_table.cc:
  Auto merged
```
bc6dac35

Merge mysql.com:/extern/mysql/5.1/generic/mysql-5.0-merge · 3da0ac8f

unknown authored Apr 25, 2006

into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new


mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/timezone_grant.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/lex.h:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
mysql-test/r/rpl_insert_id.result:
  Manual merge.
mysql-test/t/disabled.def:
  Manual merge.
mysql-test/t/rpl_insert_id.test:
  Manual merge.
sql/item_func.cc:
  Manual merge.
sql/sql_yacc.yy:
  Manual merge - not complete yet.

3da0ac8f

Merge jonas@perch:src/51-work/ · 96a45594

unknown authored Apr 25, 2006

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


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

96a45594

Merge perch.ndb.mysql.com:/home/jonas/src/50-work · 67c069d9

unknown authored Apr 25, 2006

into  perch.ndb.mysql.com:/home/jonas/src/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

67c069d9