mariadb/sql-common
Marko Mäkelä 48c67038b9 Merge 10.1 into 10.2
For MDEV-15955, the fix in create_tmp_field_from_item() would cause a
compilation error. After a discussion with Alexander Barkov, the fix
was omitted and only the test case was kept.

In 10.3 and later, MDEV-15955 is fixed properly by overriding
create_tmp_field() in Item_func_user_var.
2019-08-20 09:15:28 +03:00
..
client.c MDEV-19750 mysql command wrong encoding 2019-06-17 18:04:47 +01:00
client_plugin.c Merge branch '5.5' into 10.1 2019-07-25 17:42:20 +02:00
conf_to_src.c Merge 10.1 into 10.2 2019-05-13 17:54:04 +03:00
errmsg.c Merge 10.1 into 10.2 2019-05-13 17:54:04 +03:00
my_time.c Merge 10.1 into 10.2 2019-08-20 09:15:28 +03:00
my_user.c Merge branch '5.5' into 10.1 2019-05-11 22:19:05 +03:00
mysql_async.c MDEV-13384 - misc Windows warnings fixed 2017-09-28 17:20:46 +00:00
pack.c Merge 10.1 into 10.2 2019-05-13 17:54:04 +03:00