update opensrv for fix issue 4430

query/Cargo.toml

@@ -54,7 +54,7 @@ common-tracing = { path = "../common/tracing" }
 bincode = { git = "https://github.com/datafuse-extras/bincode", rev = "fd3f9ff" }
 cargo-license = { git = "https://github.com/datafuse-extras/cargo-license", rev = "f1ce4a2" }
 opensrv-clickhouse = { git = "https://github.com/datafuselabs/opensrv", rev = "9690be9", package = "opensrv-clickhouse" }
-opensrv-mysql = { git = "https://github.com/datafuselabs/opensrv", rev = "9690be9", package = "opensrv-mysql" }
+opensrv-mysql = { git = "https://github.com/datafuselabs/opensrv", rev = "e744427", package = "opensrv-mysql" }
 sqlparser = { git = "https://github.com/datafuse-extras/sqlparser-rs", rev = "da3b180" }
 
 # Crates.io dependencies

query/src/servers/mysql/mysql_interactive_worker.rs

@@ -361,6 +361,9 @@ impl<W: std::io::Write> InteractiveWorkerBase<W> {
     }
 
     async fn do_init(&mut self, database_name: &str) -> Result<()> {
+        if database_name.is_empty() {
+            return Ok(());
+        }
         let init_query = format!("USE `{}`;", database_name);
 
         let do_query = self.do_query(&init_query).await;

query/src/sessions/session_ctx.rs

@@ -91,10 +91,11 @@ impl SessionContext {
     pub fn get_current_tenant(&self) -> String {
         if self.conf.query.management_mode {
             let lock = self.current_tenant.read();
-            lock.clone()
-        } else {
-            self.conf.query.tenant_id.clone()
+            if !lock.is_empty() {
+                return lock.clone();
+            }
         }
+        self.conf.query.tenant_id.clone()
     }
 
     // Get current user

query/tests/it/sessions/session.rs

@@ -81,7 +81,7 @@ async fn test_session_in_management_mode() -> Result<()> {
     // Tenant.
     {
         let actual = session.get_current_tenant();
-        assert_eq!(&actual, "");
+        assert_eq!(&actual, "test");
 
         session.set_current_tenant("tenant2".to_string());
         let actual = session.get_current_tenant();