diff options
author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-17 09:45:36 +0100 |
---|---|---|
committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-17 09:45:36 +0100 |
commit | 607941de2e96bef5cc88e53c93d700aca0cff840 (patch) | |
tree | e4b2848c7525b508ab99249f5aa768c7b5061077 /sql/sp.cc | |
parent | fe28526ba14cfe5ea073c37eda4d351cf723ef69 (diff) | |
parent | 02cdb7eccab6fe262d4a9d430f9d23eb51ac4839 (diff) | |
download | mariadb-git-607941de2e96bef5cc88e53c93d700aca0cff840.tar.gz |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into mysql.com:/misc/mysql/31752_/50-31752_
client/mysql.cc:
Auto merged
sql/log.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sp.cc:
Auto merged
sql/unireg.cc:
Auto merged
Diffstat (limited to 'sql/sp.cc')
-rw-r--r-- | sql/sp.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index 0b84e1ad07f..f8b039626f9 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -1895,7 +1895,7 @@ sp_use_new_db(THD *thd, LEX_STRING new_db, LEX_STRING *old_db, if (thd->db) { - old_db->length= (strmake(old_db->str, thd->db, old_db->length) - + old_db->length= (strmake(old_db->str, thd->db, old_db->length - 1) - old_db->str); } else |