1
0
mirror of https://github.com/MariaDB/server.git synced 2025-11-10 23:02:54 +03:00
Commit Graph

11810 Commits

Author SHA1 Message Date
unknown
4b7c4cd27f Fixed bug#18739: non-standard HAVING extension was allowed in strict ANSI sql mode.
The SQL standard doesn't allow to use in HAVING clause fields that are not 
present in GROUP BY clause and not under any aggregate function in the HAVING
clause. However, mysql allows using such fields. This extension assume that 
the non-grouping fields will have the same group-wise values. Otherwise, the 
result will be unpredictable. This extension allowed in strict 
MODE_ONLY_FULL_GROUP_BY sql mode results in misunderstanding of HAVING 
capabilities.

The new error message ER_NON_GROUPING_FIELD_USED message is added. It says
"non-grouping field '%-.64s' is used in %-.64s clause". This message is
supposed to be used for reporting errors when some field is not found in the
GROUP BY clause but have to be present there. Use cases for this message are 
this bug and when a field is present in a SELECT item list not under any 
aggregate function and there is GROUP BY clause present which doesn't mention 
that field. It renders the ER_WRONG_FIELD_WITH_GROUP error message obsolete as
being more descriptive.
The resolve_ref_in_select_and_group() function now reports the 
ER_NON_GROUPING_FIELD_FOUND error if the strict mode is set and the field for 
HAVING clause is found in the SELECT item list only.



sql/share/errmsg.txt:
  Added the new ER_NON_GROUPING_FIELD_USED error message for the bug#14169.
mysql-test/t/having.test:
  Added test case for the bug#18739:  non-standard HAVING extension was allowed in strict ANSI sql mode.
mysql-test/r/having.result:
  Added test case for the bug#18739:  non-standard HAVING extension was allowed in strict ANSI sql mode.
sql/sql_select.cc:
  Added TODO comment to change the ER_WRONG_FIELD_WITH_GROUP to more detailed ER_NON_GROUPING_FIELD_USED message.
sql/item.cc:
  Fixed bug#18739: non-standard HAVING extension was allowed in strict ANSI sql mode.
  The resolve_ref_in_select_and_group() function now reports the
  ER_NON_GROUPING_FIELD_FOUND error if the strict MODE_ONLY_FULL_GROUP_BY mode
  is set and the field for HAVING clause is found in the SELECT item list only.
2006-04-21 01:52:59 +04:00
unknown
4369050126 Restoring changes erroneously removed by applying
the innodb-5.0-ss476 snapshot.
2006-04-21 01:37:31 +04:00
unknown
7ee05d7c71 Applied innodb-5.0-ss476 snapshot.
Fix BUG#18934: "InnoDB crashes when table uses column like DB_ROW_ID".
 Also, fix memory leaks in row_create_table_for_mysql() in rare
 corner cases.


innobase/dict/dict0dict.c:
  Applied innodb-5.0-ss476 snapshot.
   Refuse tables that use reserved column names (Bug#18934).
innobase/dict/dict0load.c:
  Applied innodb-5.0-ss476 snapshot.
   dict_load_table(): Refuse to load tables with other TYPE
   than DICT_TABLE_ORDINARY.
innobase/dict/dict0mem.c:
  Applied innodb-5.0-ss476 snapshot.
   Add dict_mem_table_free(), use it instead of duplicating
   the code everywhere.
innobase/ibuf/ibuf0ibuf.c:
  Applied innodb-5.0-ss476 snapshot.
innobase/include/dict0dict.h:
  Applied innodb-5.0-ss476 snapshot.
   Refuse tables that use reserved column name (Bug#18934).
innobase/include/dict0mem.h:
  Applied innodb-5.0-ss476 snapshot.
   Add dict_mem_table_free(), use it instead of duplicating
   the code everywhere.
innobase/include/univ.i:
  Applied innodb-5.0-ss476 snapshot.
innobase/log/log0recv.c:
  Applied innodb-5.0-ss476 snapshot.
innobase/row/row0mysql.c:
  Applied innodb-5.0-ss476 snapshot.
   Refuse tables that use reserved column names (Bug#18934).
mysql-test/r/innodb.result:
  Applied innodb-5.0-ss476 snapshot.
   Fix result for test case for Bug#18934.
   (Other changes are to be restored by the next cset).
mysql-test/t/innodb.test:
  Applied innodb-5.0-ss476 snapshot.
   Fix result for test case for Bug#18934.
   (Removed test case for Bug#14360 is to be restored by the next cset).
2006-04-21 01:07:37 +04:00
unknown
e66e612931 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18962


mysql-test/r/partition_pruning.result:
  Auto merged
sql/partition_info.cc:
  Auto merged
2006-04-20 14:16:27 -04:00
unknown
db623fa89f Post merge correction for the Changesset
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)


mysql-test/r/rpl_deadlock.result:
  Updated result
2006-04-20 19:43:02 +02:00
unknown
73434916f6 ndb/repl - bug#19004 rpl_ndb_2myisam ok, rpl_ndb_2innodb new bug(number)19227
mysql-test/include/rpl_multi_engine3.inc:
  add some sleep for __slow__ replication
mysql-test/t/disabled.def:
  enable rpl_ndb_2myisam but keep rpl_ndb_2innodb disabled, new bug#19227
2006-04-20 18:53:23 +02:00
unknown
f9c7528ab9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/opt/local/work/mysql-5.1-merge
2006-04-20 20:49:41 +04:00
unknown
cfe3397e38 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-20 07:24:34 -07:00
unknown
f9523779ea Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into  mysql.com:/extern/mysql/5.0/bug18949/mysql-5.0-runtime


sql/sql_yacc.yy:
  Auto merged
2006-04-20 16:00:33 +02:00
unknown
52b0bb6ed4 added missing cleanup in test causing later test to fail 2006-04-20 15:28:31 +02:00
unknown
0eb3afaf6f Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
2006-04-20 15:25:28 +02:00
unknown
526ae03c5a add mysql test run (from shell script) option to skip binlogs 2006-04-20 14:43:06 +02:00
unknown
c01754c9f3 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2006-04-20 13:35:34 +02:00
unknown
f9d56ce8ef Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code: updated with new expected error codes 2006-04-20 13:32:41 +02:00
unknown
58938d21ca Merge three.local.lan:/home/matthias/Arbeit/mysql-5.0/src
into  three.local.lan:/home/matthias/Arbeit/mysql-5.0/src-1
2006-04-20 12:35:10 +02:00
unknown
316c96fa81 Fix for bug#19196: Attempt to create index on usupported field type gives wrong error code 2006-04-20 12:06:22 +02:00
unknown
c2911e9425 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
2006-04-20 12:06:14 +02:00
unknown
d27c7a7c80 func_gconcat.result, func_gconcat.test:
Remove duplicate test case for bug#14169


mysql-test/t/func_gconcat.test:
  Remove duplicate test case for bug#14169
mysql-test/r/func_gconcat.result:
  Remove duplicate test case for bug#14169
2006-04-20 13:34:14 +04:00
unknown
5f3c91080c Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1
into  production.mysql.com:/usersnfs/mleich/src
2006-04-20 11:31:22 +02:00
unknown
a008bb512d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
2006-04-20 11:11:21 +02:00
unknown
fffe7c4d1e func_gconcat.test:
Clean up test case for bug#14169


mysql-test/t/func_gconcat.test:
  Clean up test case for bug#14169
2006-04-20 12:35:33 +04:00
unknown
b30d80e826 Post merge fix 2006-04-20 00:42:12 -07:00
unknown
01aba07c47 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new
2006-04-20 09:00:49 +02:00
unknown
e0127921c6 Bug#16993 (ALTER TABLE ADD col AUTO_INCREMENT does not replicate):
Removed rpl_ndb_relay_space test since it does not make sense (in
its current form) for NDB.


BitKeeper/deleted/.del-rpl_ndb_relay_space.test~55e5e4b13d3936d0:
  Delete: mysql-test/t/rpl_ndb_relay_space.test
BitKeeper/deleted/.del-rpl_ndb_relay_space.result~a44835cdd2210d18:
  Delete: mysql-test/r/rpl_ndb_relay_space.result
2006-04-20 08:56:47 +02:00
unknown
0775a71222 Merge rurik.mysql.com:/home/igor/mysql-5.0
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-04-19 18:27:18 -07:00
unknown
73a66e27e6 Merge c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1-new
into  c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2826


configure.in:
  Auto merged
dbug/dbug.c:
  Auto merged
include/my_sys.h:
  Auto merged
sql/ha_heap.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/partition_info.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
BUILD/SETUP.sh:
  manual merge
BUILD/compile-pentium-debug-max:
  manual merge
sql/ha_ndbcluster.cc:
  manual merge
sql/ha_ndbcluster.h:
  manual merge
sql/ha_partition.cc:
  manual merge
sql/ha_partition.h:
  manual merge
sql/handler.h:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_table.cc:
  manual merge
sql/unireg.cc:
  manual merge
2006-04-19 21:22:35 -04:00
unknown
8e27c3744f Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-2
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysys/mf_keycache.c:
  Auto merged
ndb/src/kernel/SimBlockList.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
mysql-test/r/func_gconcat.result:
  Manual merge
mysql-test/r/key_cache.result:
  Manual merge
mysql-test/t/func_gconcat.test:
  Manual merge
mysql-test/t/key_cache.test:
  Manual merge
sql/item_func.cc:
  Manual merge
sql/item_sum.h:
  Manual merge
sql/lock.cc:
  Manual merge
sql/sql_select.cc:
  Manual merge
sql/unireg.h:
  Manual merge
2006-04-19 18:08:15 -07:00
unknown
e4d653abb8 Temporarily commented out a query from the test case for bug 14169 to make it pass with --ps-protocol.
mysql-test/r/func_gconcat.result:
  Added DROP TABLE command to the test case for bug 14169.
2006-04-19 16:08:37 -07:00
unknown
c5363887e7 cluster: letting first mysql server startup properly before tstarting next 2006-04-19 23:50:51 +02:00
unknown
2ff336e27a BUG#17400 enabled rpl_ndb_dd_partitions 2006-04-19 23:46:40 +02:00
unknown
34efb701ed Merge rurik.mysql.com:/home/igor/mysql-4.1
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-2
2006-04-19 14:42:51 -07:00
unknown
d8df724af2 Merge mysql.com:/home/jimw/my/mysql-5.0-17043
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2006-04-19 14:18:35 -07:00
unknown
1f4dd29c00 Turn on test timing in mysql-test-run.pl by default, and clean up usage docs.
mysql-test/mysql-test-run.pl:
  Turn on test timing by default, but make it so it can be turned off with
  --notimer. Also clean up the mysql-test-run.pl usage information a little
  bit, and add --benchdir to it.
2006-04-19 14:09:49 -07:00
unknown
8d3e92e320 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
2006-04-19 22:46:01 +02:00
unknown
913c8fa185 func_gconcat.result:
Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.


mysql-test/r/func_gconcat.result:
  Corrected test case for the bug#14169 to make it pass in --ps-protocol mode.
2006-04-20 00:27:43 +04:00
unknown
213a6d1031 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new


mysql-test/t/disabled.def:
  Auto merged
2006-04-19 19:56:52 +02:00
unknown
b538c3522a Disabling test that fails. There is already a bug for the failure.
mysql-test/t/disabled.def:
  Disabling failing test.
2006-04-19 19:53:17 +02:00
unknown
8fda6848e7 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-04-19 10:45:06 -07:00
unknown
222cd6e891 Merge mysql.com:/opt/local/work/tmp_merge
into  mysql.com:/opt/local/work/mysql-5.1-merge


mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/set_var.cc:
  Manual merge.
sql/set_var.h:
  Manual merge.
sql/share/errmsg.txt:
  Manual merge.
2006-04-19 21:12:24 +04:00
unknown
c7cd7951cf Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into  mysql.com:/home/dlenev/mysql-5.0-bg16021


sql/item_func.cc:
  Auto merged
2006-04-19 19:35:32 +04:00
unknown
de76dd3a1f Added test case for bug #16021 "Wrong index given to function in trigger"
which was caused by the same bulk insert optimization as bug #17764 but
had slightly different symptoms.
2006-04-19 19:13:03 +04:00
unknown
f2ad5332f3 Bug#19190 syntax error in mysql-test/mysql-test-run.sh script
mysql-test/mysql-test-run.sh:
  Use 'test', not '[' as the shell builtin might not have '-L
2006-04-19 16:23:35 +02:00
unknown
24c005cf2b Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new
2006-04-19 15:33:31 +02:00
unknown
d77cfdc756 Bug#16993 (ALTER TABLE ZEROFILL AUTO_INCREMENT not replicated correctly):
This is not a bug. Enabling disabled test and adding comment.


mysql-test/extra/rpl_tests/rpl_sv_relay_space.test:
  Adding comment about test.
mysql-test/r/rpl_ndb_relay_space.result:
  Result change.
mysql-test/r/rpl_relay_space_innodb.result:
  Result change.
mysql-test/r/rpl_relay_space_myisam.result:
  Result change.
mysql-test/t/disabled.def:
  Enabling test
2006-04-19 15:29:49 +02:00
unknown
db37c0d615 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-19 14:58:42 +02:00
unknown
37fdc23672 BUG#18094 Slave caches invalid table definition after atlters causes select failure
- return correct object status from ndb dictionary
- check for validity of index retrieved from index, and retry if invalid
2006-04-19 14:54:39 +02:00
unknown
f5b0b1c3a8 Merge neptunus.(none):/home/msvensson/mysql/bug18564/my50-bug18564
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-04-19 13:56:09 +02:00
unknown
4441e34e38 BUG#18160 - Memory-/HEAP Table endless growing indexes
Updating data in HEAP table with BTREE index results in wrong index_length
counter value, which keeps growing after each update.

When inserting new record into tree counter is incremented by:
sizeof(TREE_ELEMENT) + key_size + tree->size_of_element
But when deleting element from tree it doesn't decrement counter by key_size:
sizeof(TREE_ELEMENT) + tree->size_of_element

This fix makes accurate allocated memory counter for tree. That is
decrease counter by key_size when deleting tree element.


heap/hp_delete.c:
  Added size of the key to tree_delete() for accurate allocated memory counter.
include/my_tree.h:
  Added size of the key to tree_delete() for accurate allocated memory counter.
myisam/myisamlog.c:
  Added size of the key to tree_delete() for accurate allocated memory counter.
mysql-test/r/heap_btree.result:
  Testcase for BUG#18160.
mysql-test/t/heap_btree.test:
  Testcase for BUG#18160.
mysys/tree.c:
  Added size of the key to tree_delete() for accurate allocated memory counter.
  Note that this size is optional. If one doesn't need precise counter it is safe
  to pass 0 as key_size.
2006-04-19 15:13:50 +05:00
unknown
cbdc730ae5 Fixed timeing problem by ignoring failures and results from first select after table definition change
mysql-test/r/ndb_alter_table2.result:
  Fixed timeing problem by ignoring failures and results from first select after table definition changethe
mysql-test/r/ndb_alter_table_stm.result:
  Fixed timeing problem by ignoring failures and results from first select after table definition changethe
2006-04-19 12:21:33 +03:00
unknown
1fa3cdd006 Merge mysql.com:/home/bkroot/mysql-5.1-new
into  mysql.com:/home/bk/b17400-mysql-5.1-new


mysql-test/t/disabled.def:
  Merge with mysql-5.1-new
2006-04-19 10:58:44 +02:00