6 Commits

Author	SHA1	Message	Date
Marko Mäkelä	625951cb28	After-merge fix: Adjust some results.	2017-09-20 20:47:18 +03:00
Alexander Barkov	988a9daa94	Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext ... Conflicts: mysql-test/r/func_json.result mysql-test/r/win.result mysql-test/t/func_json.test mysql-test/t/win.test sql/share/errmsg-utf8.txt storage/rocksdb/ha_rocksdb.cc storage/rocksdb/mysql-test/rocksdb/r/tbl_opt_data_index_dir.result	2017-08-07 21:35:34 +04:00
Alexander Barkov	ac53b49b1b	Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext	2017-05-05 16:12:54 +04:00
Monty	470c3fd98d	Change error message when using DROP VIEW on a non existing view from ... "Unknown table" to "Unknown view"	2017-04-07 18:22:06 +04:00
Sergei Golubchik	006ffca56e	after-merge fixes	2015-08-04 23:40:25 +02:00
Monty	2e941fe9fc	Fixed crashing bug when using ONLY_FULL_GROUP_BY in a stored procedure/trigger that is repeatedly executed. ... This is MDEV-7601, including it's sub tasks MDEV-7594, MDEV-7555, MDEV-7590, MDEV-7581, MDEV-7589 The problem was that select_lex->non_agg_fields was not properly reset for re-execution and this caused an overwrite of a random memory position. The fix was move non_agg_fields from select_lext to JOIN, which is properly reset.	2015-06-25 23:18:48 +03:00