Skip to content

Commit 347f3f5

Browse files
committed
bump opensrv-mysql 0.9.0
1 parent e652d85 commit 347f3f5

File tree

5 files changed

+5
-6
lines changed

5 files changed

+5
-6
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ openraft = { version = "0.10.0", features = [
418418
"serde",
419419
"tracing-log",
420420
] }
421-
opensrv-mysql = { path = "../opensrv/mysql", features = ["tls"] }
421+
opensrv-mysql = { git = "https://github.com/databendlabs/opensrv.git", tag = "v0.9.0", features = ["tls"] }
422422
orc-rust = "0.6.0"
423423
ordered-float = { version = "5.0.0", default-features = false }
424424
ordq = "0.2.0"

src/query/service/src/servers/mysql/mysql_interactive_worker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ impl InteractiveWorkerBase {
401401
if data_block.num_rows() > 0 {
402402
info!("Federated response: {:?}", data_block);
403403
}
404-
let has_result = schema.fields().len() > 0 || data_block.num_columns() > 0;
404+
let has_result = !schema.fields().is_empty() || data_block.num_columns() > 0;
405405
Ok((
406406
QueryResult::create(
407407
DataBlockStream::create(None, vec![data_block]).boxed(),

src/query/service/src/servers/mysql/writers/query_result_writer.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,7 @@ impl<'a, W: AsyncWrite + Send + Unpin> DFQueryResultWriter<'a, W> {
241241

242242
fn column_length(field: &DataField) -> u32 {
243243
let length = compute_length(field.data_type());
244-
let length = length.max(1).min(16382);
245-
length
244+
length.clamp(1, 16382)
246245
}
247246

248247
fn make_column_from_field(field: &DataField) -> Result<Column> {

src/query/storages/information_schema/src/character_sets_table.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ const CHARACTER_SETS: &[(&str, &str, &str, u8)] = &[
5858
("gbk", "gbk_chinese_ci", "GBK Simplified Chinese", 2),
5959
("latin5", "latin5_turkish_ci", "ISO 8859-9 Turkish", 1),
6060
("armscii8", "armscii8_general_ci", "ARMSCII-8 Armenian", 1),
61-
("utf8mb3", "utf8mb3_general_ci", "UTF-8 Unicode", 3),
61+
("utf8", "utf8_general_ci", "UTF-8 Unicode", 3),
6262
("ucs2", "ucs2_general_ci", "UCS-2 Unicode", 2),
6363
("cp866", "cp866_general_ci", "DOS Russian", 1),
6464
(

0 commit comments

Comments
 (0)