-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix old_mode flags conflict between OLD_MODE_NO_NULL_COLLATION_IDS and OLD_MODE_LOCK_ALTER_TABLE_COPY. Both flags used to be 1 << 6, now OLD_MODE_LOCK_ALTER_TABLE_COPY changed to be 1 << 7
- Loading branch information
Showing
47 changed files
with
525 additions
and
211 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
$assembly = [system.reflection.Assembly]::LoadWithPartialName("MySql.Data") | ||
if ($assembly -eq $null) | ||
{ | ||
"Can't load assembly MySql.Data" | ||
exit 100 | ||
} | ||
|
||
try | ||
{ | ||
$connectionString =[string]::Format("server=127.0.0.1;uid=root;port={0};Connection Reset=true;",$Env:MASTER_MYPORT) | ||
$connection = [MySql.Data.MySqlClient.MySqlConnection]@{ConnectionString=$connectionString} | ||
$connection.Open() | ||
|
||
# Test ExecuteReader() | ||
$command = New-Object MySql.Data.MySqlClient.MySqlCommand | ||
$command.Connection = $connection | ||
$command.CommandText = "SELECT @@old_mode" | ||
$reader = $command.ExecuteReader() | ||
$reader.GetName(0) | ||
while ($reader.Read()) | ||
{ | ||
$reader.GetValue(0) | ||
} | ||
|
||
# Test connection reset | ||
$connection.Close() | ||
$connection.Open() | ||
# Test ExecuteNonQuery() | ||
$command.CommandText="do 1"; | ||
$affected_rows = $command.ExecuteNonQuery() | ||
if ($affected_rows -ne 0) | ||
{ | ||
"Expected affected rows 0, actual $affected_rows" | ||
exit 1 | ||
} | ||
# Test Prepared Statement | ||
$command.CommandText = "SELECT @var"; | ||
[void]$command.Parameters.AddWithValue("@var", 1); | ||
$command.Prepare(); | ||
$out = $command.ExecuteScalar(); | ||
if ($out -ne 1) | ||
{ | ||
"Expected output 1, actual $out" | ||
exit 1 | ||
} | ||
$connection.Close() | ||
} | ||
catch | ||
{ | ||
# Dump exception | ||
$_ | ||
$inner = $PSItem.Exception.InnerException | ||
if ($inner -ne $null) | ||
{ | ||
$PSItem.Exception.InnerException.Message | ||
$PSItem.Exception.InnerException.StackTrace | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
@@old_mode | ||
UTF8_IS_UTF8MB3,NO_NULL_COLLATION_IDS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--source include/windows.inc | ||
let $sys_errno=0; | ||
|
||
# Error 100 is returned by the powershell script | ||
# if MySql.Data is not installed | ||
--error 0,100 | ||
--exec powershell -NoLogo -NoProfile -File main\mysql_connector_net.ps1 | ||
if ($sys_errno != 0) | ||
{ | ||
--skip Connector/NET is not installed | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
@@ -7,7 +7,6 @@ | ||
WHERE name LIKE 'wait/synch/rwlock/innodb/%' | ||
AND name!='wait/synch/rwlock/innodb/btr_search_latch' ORDER BY name; | ||
name | ||
-wait/synch/rwlock/innodb/dict_operation_lock | ||
wait/synch/rwlock/innodb/fil_space_latch | ||
wait/synch/rwlock/innodb/lock_latch | ||
wait/synch/rwlock/innodb/trx_i_s_cache_lock | ||
@@ -19,11 +18,13 @@ | ||
select name from performance_schema.setup_instruments | ||
where name like "wait/synch/sxlock/%" order by name; | ||
name | ||
+wait/synch/sxlock/innodb/dict_operation_lock | ||
wait/synch/sxlock/innodb/index_tree_rw_lock | ||
SELECT DISTINCT name FROM performance_schema.rwlock_instances | ||
WHERE name LIKE 'wait/synch/sxlock/innodb/%' | ||
ORDER BY name; | ||
name | ||
+wait/synch/sxlock/innodb/dict_operation_lock | ||
wait/synch/sxlock/innodb/index_tree_rw_lock | ||
create table t1(a int) engine=innodb; | ||
begin; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.