summaryrefslogtreecommitdiff
path: root/Docs
diff options
context:
space:
mode:
Diffstat (limited to 'Docs')
-rw-r--r--Docs/mysql.info6
-rw-r--r--Docs/sp-imp-spec.txt4
2 files changed, 5 insertions, 5 deletions
diff --git a/Docs/mysql.info b/Docs/mysql.info
index 684c0d23437..02692f341d3 100644
--- a/Docs/mysql.info
+++ b/Docs/mysql.info
@@ -1,11 +1,11 @@
MariaDB is in most aspects identical to MySQL.
Differences between MySQL and MariaDB can be found at:
-http://kb.askmonty.org/en/mariadb-versus-mysql-features/
-http://kb.askmonty.org/en/mariadb-versus-mysql-compatibility/
+https://mariadb.com/kb/en/mariadb-vs-mysql-features/
+https://mariadb.com/kb/en/mariadb-vs-mysql-compatibility/
The MariaDB manual can be found at:
-http://kb.askmonty.org/
+https://mariadb.com/kb/
The MySQL Reference Manual is available in various formats on
http://dev.mysql.com/doc.
diff --git a/Docs/sp-imp-spec.txt b/Docs/sp-imp-spec.txt
index 9795dd72252..259d76ab5bb 100644
--- a/Docs/sp-imp-spec.txt
+++ b/Docs/sp-imp-spec.txt
@@ -243,7 +243,7 @@
in the caller's frame is set in the new context as well.
4) For each instruction, call its execute() method.
The result is a pointer to the next instruction to execute (or NULL)
- if an error occured.
+ if an error occurred.
5) On success, set the new values of the OUT and INOUT parameters in
the caller's frame.
@@ -853,7 +853,7 @@
// '*nextp' will be set to the index of the next instruction
// to execute. (For most instruction this will be the
// instruction following this one.)
- // Returns 0 on success, non-zero if some error occured.
+ // Returns 0 on success, non-zero if some error occurred.
virtual int execute(THD *, uint *nextp)
}