Merge pull request #39 from mjgarton/upgrade_mysql_driver

Upgrade mysql driver

Author: jonhoo

Cargo.toml

@@ -36,7 +36,7 @@ rustls = {version = "0.20.0", optional=true}
 
 [dev-dependencies]
 postgres = "0.19.1"
-mysql = "18"
+mysql = "22"
 mysql_async = "0.29.0"
 slab = "0.4.2"
 tokio = { version = "1.15.0", features = ["full"] }

tests/main.rs

@@ -516,21 +516,21 @@ fn multi_result() {
         let mut result = db
             .query_iter("SELECT a FROM foo; SELECT a FROM foo")
             .unwrap();
-        let mut set = result.next_set().unwrap().unwrap();
+        let mut set = result.iter().unwrap();
         let row1: Vec<_> = set
             .by_ref()
             .filter_map(|row| row.unwrap().get::<i16, _>(0))
             .collect();
         assert_eq!(row1, vec![1024]);
         drop(set);
-        let mut set = result.next_set().unwrap().unwrap();
+        let mut set = result.iter().unwrap();
         let row2: Vec<_> = set
             .by_ref()
             .filter_map(|row| row.unwrap().get::<i16, _>(0))
             .collect();
         assert_eq!(row2, vec![1025]);
         drop(set);
-        assert!(result.next_set().is_none());
+        assert!(result.iter().is_none());
     })
 }