mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
fifth set of fixes to bug#35988.
This commit is contained in:
@ -78,4 +78,5 @@ DROP PREPARE stmt;
|
|||||||
DROP PREPARE stmt1;
|
DROP PREPARE stmt1;
|
||||||
DROP PREPARE stmt2;
|
DROP PREPARE stmt2;
|
||||||
DROP PREPARE stmt3;
|
DROP PREPARE stmt3;
|
||||||
|
DROP PROCEDURE sp_checkstmts;
|
||||||
SET @@global.max_prepared_stmt_count = @global_max_prepared_stmt_count;
|
SET @@global.max_prepared_stmt_count = @global_max_prepared_stmt_count;
|
||||||
|
@ -26,7 +26,6 @@
|
|||||||
--source include/have_ujis.inc
|
--source include/have_ujis.inc
|
||||||
--source include/have_sjis.inc
|
--source include/have_sjis.inc
|
||||||
--source include/have_utf8.inc
|
--source include/have_utf8.inc
|
||||||
--source include/have_uds.inc
|
|
||||||
--source include/have_ucs2.inc
|
--source include/have_ucs2.inc
|
||||||
|
|
||||||
--source include/load_sysvars.inc
|
--source include/load_sysvars.inc
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
--source include/have_ujis.inc
|
--source include/have_ujis.inc
|
||||||
--source include/have_sjis.inc
|
--source include/have_sjis.inc
|
||||||
--source include/have_utf8.inc
|
--source include/have_utf8.inc
|
||||||
--source include/have_uds.inc
|
--source include/have_ucs2.inc
|
||||||
|
|
||||||
--source include/load_sysvars.inc
|
--source include/load_sysvars.inc
|
||||||
###################################################
|
###################################################
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
--source include/have_ujis.inc
|
--source include/have_ujis.inc
|
||||||
--source include/have_sjis.inc
|
--source include/have_sjis.inc
|
||||||
--source include/have_utf8.inc
|
--source include/have_utf8.inc
|
||||||
--source include/have_uds.inc
|
--source include/have_ucs2.inc
|
||||||
|
|
||||||
--source include/load_sysvars.inc
|
--source include/load_sysvars.inc
|
||||||
###################################################
|
###################################################
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
--source include/have_ujis.inc
|
--source include/have_ujis.inc
|
||||||
--source include/have_sjis.inc
|
--source include/have_sjis.inc
|
||||||
--source include/have_utf8.inc
|
--source include/have_utf8.inc
|
||||||
--source include/have_uds.inc
|
--source include/have_ucs2.inc
|
||||||
|
|
||||||
--source include/load_sysvars.inc
|
--source include/load_sysvars.inc
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
--source include/have_ujis.inc
|
--source include/have_ujis.inc
|
||||||
--source include/have_sjis.inc
|
--source include/have_sjis.inc
|
||||||
--source include/have_utf8.inc
|
--source include/have_utf8.inc
|
||||||
--source include/have_uds.inc
|
--source include/have_ucs2.inc
|
||||||
|
|
||||||
--source include/load_sysvars.inc
|
--source include/load_sysvars.inc
|
||||||
################################################
|
################################################
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
--source include/have_ujis.inc
|
--source include/have_ujis.inc
|
||||||
--source include/have_sjis.inc
|
--source include/have_sjis.inc
|
||||||
--source include/have_utf8.inc
|
--source include/have_utf8.inc
|
||||||
--source include/have_uds.inc
|
--source include/have_ucs2.inc
|
||||||
|
|
||||||
--source include/load_sysvars.inc
|
--source include/load_sysvars.inc
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
--source include/have_ujis.inc
|
--source include/have_ujis.inc
|
||||||
--source include/have_sjis.inc
|
--source include/have_sjis.inc
|
||||||
--source include/have_utf8.inc
|
--source include/have_utf8.inc
|
||||||
--source include/have_uds.inc
|
--source include/have_ucs2.inc
|
||||||
|
|
||||||
--source include/load_sysvars.inc
|
--source include/load_sysvars.inc
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
--source include/have_ujis.inc
|
--source include/have_ujis.inc
|
||||||
--source include/have_sjis.inc
|
--source include/have_sjis.inc
|
||||||
--source include/have_utf8.inc
|
--source include/have_utf8.inc
|
||||||
--source include/have_uds.inc
|
--source include/have_ucs2.inc
|
||||||
|
|
||||||
--source include/load_sysvars.inc
|
--source include/load_sysvars.inc
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
--source include/have_ujis.inc
|
--source include/have_ujis.inc
|
||||||
--source include/have_sjis.inc
|
--source include/have_sjis.inc
|
||||||
--source include/have_utf8.inc
|
--source include/have_utf8.inc
|
||||||
--source include/have_uds.inc
|
--source include/have_ucs2.inc
|
||||||
|
|
||||||
--source include/load_sysvars.inc
|
--source include/load_sysvars.inc
|
||||||
|
|
||||||
|
@ -19,6 +19,7 @@
|
|||||||
# #
|
# #
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
|
SET @save_div_precision_increment = @@global.div_presision_increment;
|
||||||
|
|
||||||
--disable_warnings
|
--disable_warnings
|
||||||
drop table if exists t1;
|
drop table if exists t1;
|
||||||
@ -118,7 +119,7 @@ drop table t1;
|
|||||||
disconnect test_con1;
|
disconnect test_con1;
|
||||||
disconnect test_con2;
|
disconnect test_con2;
|
||||||
|
|
||||||
|
SET @@global.div_prescision_increment = @save_div_precision_increment;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user