MDEV-16470: switch off user variables (and fixes of its support)bb-10.5-MDEV-22550

3 files changed, 19 insertions, 38 deletions

diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
index 7cbcdbad2b2..e9ea7e13c99 100644
--- a/mysql-test/main/mysqld--help.result
+++ b/mysql-test/main/mysqld--help.result
@@ -1151,8 +1151,6 @@ The following specify which files/extra groups are read (specified before remain
  characteristics (isolation level, read only/read
  write,snapshot - but not any work done / data modified
  within the transaction).
- --session-track-user-variables 
- Track changes to user variables.
  --show-slave-auth-info 
  Show user and password in SHOW SLAVE HOSTS on this
  master.
@@ -1758,7 +1756,6 @@ session-track-schema TRUE
 session-track-state-change FALSE
 session-track-system-variables autocommit,character_set_client,character_set_connection,character_set_results,time_zone
 session-track-transaction-info OFF
-session-track-user-variables FALSE
 show-slave-auth-info FALSE
 silent-startup FALSE
 skip-grant-tables TRUE
diff --git a/mysql-test/main/mysqltest_tracking_info.result b/mysql-test/main/mysqltest_tracking_info.result
index 3a4419d8651..e044b4a070d 100644
--- a/mysql-test/main/mysqltest_tracking_info.result
+++ b/mysql-test/main/mysqltest_tracking_info.result
@@ -48,20 +48,4 @@ SET @@session.session_track_system_variables= @save_session_track_system_variabl
 #
 # MDEV-16470 - Session user variables tracker
 #
-SET @@session.session_track_user_variables=1;
-SET @a=1;
-SET @b=NULL;
-SELECT @c:=10;
-@c:=10
-10
-SET @@session.session_track_user_variables=0;
-#
-# mdev-22337 Assertion `Alloced_length >= (str_length + length +
-net_length_size(length))' failed in Binary_string::q_net_store_data
-on long MULTIPOLYGON query with session_track_user_variables=1
-(optimized builds)
-#
-set @@session.session_track_user_variables=1;
-set @a=repeat('X', 1029);
-set @@session.session_track_user_variables=0;
 # End of 10.5 tests
diff --git a/mysql-test/main/mysqltest_tracking_info.test b/mysql-test/main/mysqltest_tracking_info.test
index c4dfce57fb0..0478ea560d5 100644
--- a/mysql-test/main/mysqltest_tracking_info.test
+++ b/mysql-test/main/mysqltest_tracking_info.test
@@ -49,24 +49,24 @@ SET @@session.session_track_system_variables= @save_session_track_system_variabl
 --echo #
 --echo # MDEV-16470 - Session user variables tracker
 --echo #
-SET @@session.session_track_user_variables=1;
---enable_session_track_info
-SET @a=1;
-SET @b=NULL;
-SELECT @c:=10;
---disable_session_track_info
-SET @@session.session_track_user_variables=0;
-
---echo #
---echo # mdev-22337 Assertion `Alloced_length >= (str_length + length +
---echo        net_length_size(length))' failed in Binary_string::q_net_store_data
---echo        on long MULTIPOLYGON query with session_track_user_variables=1
---echo        (optimized builds)
---echo #
-set @@session.session_track_user_variables=1;
---enable_session_track_info
-set @a=repeat('X', 1029);
---disable_session_track_info
-set @@session.session_track_user_variables=0;
+#SET @@session.session_track_user_variables=1;
+#--enable_session_track_info
+#SET @a=1;
+#SET @b=NULL;
+#SELECT @c:=10;
+#--disable_session_track_info
+#SET @@session.session_track_user_variables=0;
+
+#--echo #
+#--echo # mdev-22337 Assertion `Alloced_length >= (str_length + length +
+#--echo        net_length_size(length))' failed in Binary_string::q_net_store_data
+#--echo        on long MULTIPOLYGON query with session_track_user_variables=1
+#--echo        (optimized builds)
+#--echo #
+#set @@session.session_track_user_variables=1;
+#--enable_session_track_info
+#set @a=repeat('X', 1029);
+#--disable_session_track_info
+#set @@session.session_track_user_variables=0;
 
 --echo # End of 10.5 tests