Commits · da2d5460dd71eac404bda6213b6cc33e0ad85b46 · nexedi / MariaDB

22 Nov, 2006 2 commits
- Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.0-opt · da2d5460
  unknown authored Nov 22, 2006
```
into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt


sql/filesort.cc:
  Auto merged
```
  da2d5460
- Merge macbook.gmz:/Users/kgeorge/mysql/work/mysql-5.1 · f56f7845
  unknown authored Nov 22, 2006
```
into  macbook.gmz:/Users/kgeorge/mysql/work/merge-5.1-opt


sql/table.cc:
  Auto merged
```
  f56f7845
21 Nov, 2006 6 commits

Fix typo in comment · 102cc31e
unknown authored Nov 21, 2006

102cc31e
Merge romeo.(none):/home/bkroot/mysql-5.1 · a3fcd8b2
unknown authored Nov 21, 2006
```
into  romeo.(none):/home/bk/memcheck-mysql-5.1
```
a3fcd8b2

BUG#24403 (valgrind complaint on uninited st_table for innodb + rbr): · c6eb7737

unknown authored Nov 21, 2006

Removing DBUG_DUMP printouts for valgrind builds since they trigger warnings.
Removing valgrind memory checks completely.
Removing bzero() of record when opening table that was added earlier.


sql/log_event.cc:
  Removing DBUG_DUMP of records for valgrind builds since they trigger false valgrind
  warnings.
  Removing valgrind checks completely, since they can trigger false valgrind warnings.
sql/sql_class.cc:
  Removing DBUG_DUMP of records for valgrind builds since they trigger false valgrind
  warnings.
sql/table.cc:
  Removing extreneous bzero() that were added previously.

c6eb7737

after merge fix · 69059afd
unknown authored Nov 21, 2006

69059afd

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt · 22ab3a6a

unknown authored Nov 21, 2006

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/sql_select.cc:
  Auto merged
mysql-test/r/information_schema.result:
  SCCS merged
mysql-test/t/information_schema.test:
  SCCS merged

22ab3a6a

Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crash · 3b5c1df1

unknown authored Nov 21, 2006

disable filling of I_S tables for EXPLAIN


mysql-test/r/information_schema.result:
  Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crash
  test case
mysql-test/t/information_schema.test:
  Bug#22413 EXPLAIN SELECT FROM view with ORDER BY yield server crash
  test case

3b5c1df1

20 Nov, 2006 7 commits

Merge romeo.(none):/home/bkroot/mysql-5.1 · 2b33f02a
unknown authored Nov 20, 2006
```
into  romeo.(none):/home/bk/memcheck-mysql-5.1
```
2b33f02a

BUG#24403 (valgrind complained on uninited st_table for InnoDB and RBR): · 180c24d9

unknown authored Nov 20, 2006

Fix to correct behaviour of find_and_fetch_row() for tables that have primary keys stored
in storage engines that support the fast method to fetch rows given a primary key. The
method uses position() to retrieve the key for a given record and rnd_pos() to position
the internal "cursor" at the row. Rnd_pos() returns the found record in table->record[0],
so the record has to be moved to table->record[1] for further processing after calling
find_and_fetch_row().

sql/log_event.cc:
Adding code to one exit branch of find_and_fetch_row() to move output record from
table->record[0] to table->record[1].
Adding function to do valgrind memory check.
Adding valgrind memory checks to check that records are defined when they should be.
Adding Doxygen comment to find_and_fetch_row() with pre- and post-conditions.

180c24d9

Merge amd64.:D:/src/mysql-5.1 · 115b461d
unknown authored Nov 20, 2006
```
into  amd64.:D:/src/mysql-5.1_bug23983
```
115b461d

Bug#23983 ps.test fails to open shared library · 758758de

unknown authored Nov 20, 2006

- When a shared library argument is supplied, it's checked for an OS
specific directory separator. The expected error is different
depending on the separator used. Create OS specific versions of these
tests.


mysql-test/r/ps.result:
  Bug#23983 ps.test fails to open shared library
  - Moving to OS specific results.
mysql-test/r/windows.result:
  Bug#23983 ps.test fails to open shared library
  - OS Specific result for shared library argument with path
mysql-test/t/ps.test:
  Bug#23983 ps.test fails to open shared library
  - Moving to OS specific tests.
mysql-test/t/windows.test:
  Bug#23983 ps.test fails to open shared library
  - OS Specific test for shared library argument with path
mysql-test/r/ps_not_windows.result:
  Bug#23983 ps.test fails to open shared library
  - OS Specific result for shared library argument with path
mysql-test/t/ps_not_windows.test:
  Bug#23983 ps.test fails to open shared library
  - OS Specific test for shared library argument with path

758758de

Bug#24361 valgrind error when shutting down mysqld connected to cluster · 583995b6

unknown authored Nov 20, 2006

  - Disconnect from transporter before starting to delete objects


storage/ndb/src/ndbapi/Ndbinit.cpp:
  Make sure to disconnect from transporter to stop signals from coming in
  before starting to delete the objects that would recieve the signals

583995b6

fix for the merge of --mem support in autopush.pl in 5.1-opt · fc39a16d
unknown authored Nov 20, 2006

fc39a16d
5.0-opt -> 5.1-opt merge fixed. · ffc98202
unknown authored Nov 20, 2006

ffc98202

19 Nov, 2006 4 commits

Merge mysql.com:/home/hf/work/mysql-5.0-0mrg · cf8fe2ed

unknown authored Nov 19, 2006

into  mysql.com:/home/hf/work/mysql-5.1-mrg


client/mysqltest.c:
  Auto merged
include/my_time.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/include/deadlock.inc:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  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_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.cc:
  Auto merged
Makefile.am:
  SCCS merged
mysql-test/t/order_by.test:
  SCCS merged
mysql-test/t/type_newdecimal.test:
  merging

cf8fe2ed

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt · b2330d65
unknown authored Nov 19, 2006
```
into  mysql.com:/home/hf/work/mysql-5.0-mrg
```
b2330d65
Merge mysql.com:/home/hf/work/mysql-5.0-mrg · 7b758163
unknown authored Nov 19, 2006
```
into  mysql.com:/home/hf/work/mysql-5.1-mrg


include/mysql_h.ic:
  Auto merged
```
7b758163
Merge mysql.com:/home/hf/work/mysql-4.1-mrg · 01678f1e
unknown authored Nov 19, 2006
```
into  mysql.com:/home/hf/work/mysql-5.0-mrg


include/mysql_h.ic:
  Auto merged
```
01678f1e

18 Nov, 2006 1 commit
- merging · 081ba142
  unknown authored Nov 18, 2006
```
mysql-test/t/disabled.def:
  meging bug
```
  081ba142
17 Nov, 2006 7 commits

Bug #24403 valgrind complained on uninited st_table, rbr + innodb · 16d0d50d

unknown authored Nov 17, 2006

  
  open_table_from_share did not initialize table->record members. that was
  interpreted as the error by valgrind.
  
  Fixed with bzero-ing the members if compilation with -DHAVE_purify.


sql/table.cc:
  zeroing memory allocated for table->record[]

16d0d50d

Merge bk@192.168.21.1:mysql-5.1-opt · c313564e

unknown authored Nov 17, 2006

into  mysql.com:/home/hf/work/mysql-5.1-mrg


BitKeeper/deleted/.del-bdb-deadlock.test:
  Auto merged
Makefile.am:
  Auto merged
include/mysql.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/deadlock.inc:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
sql/table.cc:
  Auto merged
client/mysqltest.c:
  merging
include/my_time.h:
  merging
libmysql/libmysql.c:
  merging
mysql-test/t/order_by.test:
  merging
sql/sql_yacc.yy:
  merging

c313564e

Merge mysql.com:/home/hf/work/mysql-5.0-mrg · c8146c2f

unknown authored Nov 17, 2006

into  mysql.com:/home/hf/work/mysql-5.1-mrg


Makefile.am:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
BitKeeper/deleted/.del-bdb-deadlock.test:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/protocol.h:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/include/deadlock.inc:
  SCCS merged
mysql-test/t/disabled.def:
  merging
sql/item.cc:
  merging

c8146c2f

ABI fix · d24da25c

unknown authored Nov 17, 2006


include/mysql_h.ic:
  this one should actually be removed from the ABI

d24da25c

merging · d15f779d
unknown authored Nov 17, 2006

d15f779d
merging · 1842b636
unknown authored Nov 17, 2006

1842b636

Merge bk@192.168.21.1:mysql-5.0-opt · 047fc6c4

unknown authored Nov 17, 2006

into  mysql.com:/home/hf/work/mysql-5.0-0mrg


BitKeeper/deleted/.del-mysql_client.test:
  Auto merged
include/mysql.h:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/r/order_by.result:
  Auto merged
mysql-test/r/query_cache.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/query_cache.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql/item_subselect.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  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_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql-common/my_time.c:
  Auto merged
Makefile.am:
  merging
client/mysqltest.c:
  merging
include/my_time.h:
  merging
libmysql/libmysql.c:
  merging
mysql-test/t/order_by.test:
  merging

047fc6c4

16 Nov, 2006 5 commits

Merge mysql.com:/home/hf/work/mysql-4.1-mrg · 28c97d6a

unknown authored Nov 16, 2006

into  mysql.com:/home/hf/work/mysql-5.0-mrg


client/mysqltest.c:
  Auto merged
mysql-test/t/flush.test:
  Auto merged
mysql-test/t/flush_block_commit.test:
  Auto merged
mysql-test/t/innodb-deadlock.test:
  Auto merged
mysql-test/t/innodb-lock.test:
  Auto merged
mysql-test/t/lock_multi.test:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
mysql-test/t/status.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql-common/client.c:
  Auto merged
Makefile.am:
  merging
BitKeeper/deleted/.del-mysql_client.test:
  merging
include/mysql.h:
  SCCS merged
libmysql/libmysql.c:
  merging
libmysqld/lib_sql.cc:
  merging
mysql-test/r/order_by.result:
  SCCS merged
mysql-test/r/subselect.result:
  SCCS merged
mysql-test/t/order_by.test:
  merging
mysql-test/t/subselect.test:
  SCCS merged
sql/item_subselect.cc:
  merging
sql/item_subselect.h:
  merging
sql/protocol.cc:
  merging
sql/sql_class.h:
  merging

28c97d6a

merging · 5a0cf28a
unknown authored Nov 16, 2006

5a0cf28a
merging · aa681ccf
unknown authored Nov 16, 2006

aa681ccf

Merge bk@192.168.21.1:mysql-4.1 · 08ab6848

unknown authored Nov 16, 2006

into  mysql.com:/home/hf/work/mysql-4.1-mrg


include/mysql.h:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_class.h:
  Auto merged
Makefile.am:
  merging
client/mysqltest.c:
  merging
mysql-test/t/mysql_client.test:
  merging

08ab6848

Merge romeo.(none):/home/bkroot/mysql-5.1 · 666ca5c9
unknown authored Nov 16, 2006
```
into  romeo.(none):/home/bk/memcheck-mysql-5.1


sql/sql_class.cc:
  Auto merged
```
666ca5c9

15 Nov, 2006 8 commits

Dummy push to force pushbuild retest · a26d31d5
unknown authored Nov 15, 2006
```
mysql-test/t/disabled.def:
  Dummy push
```
a26d31d5

Changeset to fix a valgrind error in the main tree. · b7a36430

unknown authored Nov 15, 2006

Adding class to handle temporary allocate of memory during write of rows.
Eliminating cut'n-paste error between THD::binlog_{write,update,delete}_row().

sql/sql_class.cc:
Adding class to handle temporary allocate of memory during write of rows.
Eliminating cut'n-paste error between THD::binlog_{write,update,delete}_row().

b7a36430

Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · 9875af80

unknown authored Nov 15, 2006

into  mysql.com:/home/bk/MERGE/mysql-5.1-merge


BitKeeper/deleted/.del-CMakeLists.txt~1:
  Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2f6eabb2f69cb33d:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
configure.in:
  Manual merge, main clone 5.0->5.1

9875af80

Merge mysql.com:/home/bkroot/mysql-5.0 · 2c6bdf68
unknown authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
```
2c6bdf68
disabled test case that is still disabled in main · 45d69dad
unknown authored Nov 15, 2006

45d69dad
Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge · 7607c36a
unknown authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
```
7607c36a
Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge · 07ef1eb3
unknown authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
```
07ef1eb3
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl · 1487d9a9
unknown authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
```
1487d9a9