Ver Fonte

! TYPE=HEAP => ENGINE=MEMORY, since we're not going to support MySQL 4.0 anymore (fixes #971)

Signed-off-by: Michael Eshom <[email protected]>
Michael Eshom há 10 anos atrás
pai
commit
3be6e3b7e1

+ 2 - 2
Sources/DbSearch-postgresql.php

@@ -62,12 +62,12 @@ function smf_db_search_query($identifier, $db_string, $db_values = array(), $con
 		'create_tmp_log_search_topics' => array(
 			'~mediumint\(\d\)~i' => 'int',
 			'~unsigned~i' => '',
-			'~TYPE=HEAP~i' => '',
+			'~ENGINE=MEMORY~i' => '',
 		),
 		'create_tmp_log_search_messages' => array(
 			'~mediumint\(\d\)' => 'int',
 			'~unsigned~i' => '',
-			'~TYPE=HEAP~i' => '',
+			'~ENGINE=MEMORY~i' => '',
 		),
 		'drop_tmp_log_search_topics' => array(
 			'~IF\sEXISTS~i' => '',

+ 2 - 2
Sources/DbSearch-sqlite.php

@@ -61,11 +61,11 @@ function smf_db_search_query($identifier, $db_string, $db_values = array(), $con
 	$replacements = array(
 		'create_tmp_log_search_topics' => array(
 			'~mediumint\(\d\)~i' => 'int',
-			'~TYPE=HEAP~i' => '',
+			'~ENGINE=MEMORY~i' => '',
 		),
 		'create_tmp_log_search_messages' => array(
 			'~mediumint\(\d\)~i' => 'int',
-			'~TYPE=HEAP~i' => '',
+			'~ENGINE=MEMORY~i' => '',
 		),
 	);
 

+ 2 - 2
Sources/DbSearch-sqlite3.php

@@ -61,11 +61,11 @@ function smf_db_search_query($identifier, $db_string, $db_values = array(), $con
 	$replacements = array(
 		'create_tmp_log_search_topics' => array(
 			'~mediumint\(\d\)~i' => 'int',
-			'~TYPE=HEAP~i' => '',
+			'~ENGINE=MEMORY~i' => '',
 		),
 		'create_tmp_log_search_messages' => array(
 			'~mediumint\(\d\)~i' => 'int',
-			'~TYPE=HEAP~i' => '',
+			'~ENGINE=MEMORY~i' => '',
 		),
 	);
 

+ 2 - 2
Sources/Search.php

@@ -1237,7 +1237,7 @@ function PlushSearch2()
 						CREATE TEMPORARY TABLE {db_prefix}tmp_log_search_topics (
 							id_topic mediumint(8) unsigned NOT NULL default {string:string_zero},
 							PRIMARY KEY (id_topic)
-						) TYPE=HEAP',
+						) ENGINE=MEMORY',
 						array(
 							'string_zero' => '0',
 							'db_error_skip' => true,
@@ -1415,7 +1415,7 @@ function PlushSearch2()
 						CREATE TEMPORARY TABLE {db_prefix}tmp_log_search_messages (
 							id_msg int(10) unsigned NOT NULL default {string:string_zero},
 							PRIMARY KEY (id_msg)
-						) TYPE=HEAP',
+						) ENGINE=MEMORY',
 						array(
 							'string_zero' => '0',
 							'db_error_skip' => true,