summaryrefslogtreecommitdiff
path: root/sql/ha_partition.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-03-29 17:20:42 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2023-03-29 17:20:42 +0300
commit5e01255732f554bbf473347566439fd18c006756 (patch)
treef174de61c99f8b6428395b0275e885ee500365b6 /sql/ha_partition.cc
parent6c3b1dced41c238f814aeabbc725e31c3106c0f4 (diff)
parentd84a2826290d9676faebba0849d1b9fb7f5efcd8 (diff)
downloadmariadb-git-5e01255732f554bbf473347566439fd18c006756.tar.gz
Merge 10.11 into 11.0
Diffstat (limited to 'sql/ha_partition.cc')
-rw-r--r--sql/ha_partition.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 5948d657305..de0229e9e2d 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -10283,7 +10283,7 @@ void ha_partition::print_error(int error, myf errflag)
/*
We choose a main handler's print_error if:
* m_file has not been initialized, like in bug#42438
- * lookup_errkey is set, which means that an error has occured in the
+ * lookup_errkey is set, which means that an error has occurred in the
main handler, not in individual partitions
*/
if (m_file && lookup_errkey == (uint)-1)