Commits · 453d8fdf6fb97ab85f2085feea8007b725c09318 · nexedi / MariaDB

21 Nov, 2006 1 commit

Bug #23556: TRUNCATE TABLE still maps to DELETE · 453d8fdf

unknown authored Nov 21, 2006

 - TRUNCATE requires DROP privilege, not DELETE


mysql-test/r/grant.result:
  Bug #23556: TRUNCATE TABLE still maps to DELETE
   - test case
mysql-test/r/trigger-grant.result:
  Bug #23556: TRUNCATE TABLE still maps to DELETE
   - updated test case
mysql-test/t/grant.test:
  Bug #23556: TRUNCATE TABLE still maps to DELETE
   - test case
mysql-test/t/trigger-grant.test:
  Bug #23556: TRUNCATE TABLE still maps to DELETE
   - updated test case

453d8fdf

19 Nov, 2006 3 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 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 6 commits

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 13 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
Merge mysql.com:/home/bkroot/mysql-5.0-rpl · 363eddd2
unknown authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
```
363eddd2
Merge mysql.com:/home/bkroot/mysql-4.1-rpl · bf7ff05f
unknown authored Nov 15, 2006
```
into  mysql.com:/home/bk/MERGE/mysql-4.1-merge
```
bf7ff05f
Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 · a37414fb
unknown authored Nov 15, 2006
```
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/mysql-5.1-new-rpl
```
a37414fb
Merge dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/4.1 · c10c7380
unknown authored Nov 15, 2006
```
into  dsl-hkibras-fe30f900-107.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0
```
c10c7380

bug#19402 SQL close to the size of the max_allowed_packet fails on the slave · 145ab7ac

unknown authored Nov 15, 2006

mending windows test.


mysql-test/r/rpl_packet.result:
  results changed
mysql-test/t/rpl_packet.test:
  removing because of the connection with windows client can be lost instead of
  the error code back (source: manual).

145ab7ac

14 Nov, 2006 11 commits

Bug#20045: Server crash on INSERT ... SELECT ... FROM non-mergeable view · 0f583643

unknown authored Nov 14, 2006

The regression is caused by the fix for bug 14767. When INSERT ... SELECT
used a view in the SELECT list that was not inlined, and there was an
active transaction, the server could crash in Query_cache::invalidate.

On INSERT ... SELECT only the table being inserted into is invalidated.
Thus views that can't be inlined are skipped from invalidation.

The bug manifests itself in two ways so there is 2 test cases.
One checks that the only the table being inserted into is invalidated.
And the second one checks that there is no crash on INSERT ... SELECT.

mysql-test/t/query_cache.test:
Added a test case for bug#20045: Server crash on INSERT ... SELECT ... FROM non-mergeable view
mysql-test/r/query_cache.result:
Added a test case for bug#20045: Server crash on INSERT ... SELECT ... FROM non-mergeable view
sql/sql_parse.cc:
Bug#20045: Server crash on INSERT ... SELECT ... FROM non-mergeable view
On INSERT ... SELECT only the table being inserted into is invalidated.

0f583643

Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0 · 95d0ea41
unknown authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
```
95d0ea41
Merge dev:my/mysql-5.0-release · a6e95499
unknown authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0
```
a6e95499

Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 · de773ec7

unknown authored Nov 14, 2006

into  kahlann.erinye.com:/home/df/mysql/build/51


scripts/make_binary_distribution.sh:
  Auto merged

de773ec7

Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 · 4d36f964

unknown authored Nov 14, 2006

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


scripts/make_binary_distribution.sh:
  SCCS merged

4d36f964

make_binary_distribution should of course also copy .test files from mysql-test/include · d79b5df7
unknown authored Nov 14, 2006

d79b5df7
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-5.0 · c5c1f780
unknown authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/51


mysql-test/Makefile.am:
  Auto merged
```
c5c1f780
Merge kahlann.erinye.com:/home/df/mysql/build/mtr-4.1 · c1ab6ade
unknown authored Nov 14, 2006
```
into  kahlann.erinye.com:/home/df/mysql/build/mtr-5.0


mysql-test/Makefile.am:
  Auto merged
```
c1ab6ade

make dist now copies .test files in mysql-test/include · cea3d809

unknown authored Nov 14, 2006


mysql-test/Makefile.am:
  add include/*.test to dist-hook and install-data-local targets to include the three .test files in mysql-test/include with make dist

cea3d809

Raise version number after cloning 5.0.30 · da4d525d
unknown authored Nov 14, 2006

da4d525d

Merge trift2.:/MySQL/M50/clone-5.0 · 7bc6201c

unknown authored Nov 14, 2006

into  trift2.:/MySQL/M50/mysql-5.0


CMakeLists.txt:
  Auto merged
client/mysql.cc:
  Auto merged
sql/log.cc:
  Auto merged
configure.in:
  Late merge of 5.0.28, no change here.

7bc6201c