1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

Merge with 3.23:

Remove duplicate casedn_str() in mysql_change_db()
Fix for null handling in CASE


innobase/btr/btr0sea.c:
  Auto merged
mysql-test/t/case.test:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
mysql-test/r/case.result:
  merge with 3.23
sql/sql_db.cc:
  Merge with 3.23 (to remove duplicate casedn_str())
This commit is contained in:
unknown
2002-12-21 10:56:40 +02:00
6 changed files with 23 additions and 7 deletions

View File

@ -1238,7 +1238,14 @@ ha_innobase::open(
if (primary_key != MAX_KEY) {
fprintf(stderr,
"InnoDB: Error: table %s has no primary key in InnoDB\n"
"InnoDB: data dictionary, but has one in MySQL!\n", name);
"InnoDB: data dictionary, but has one in MySQL!\n"
"InnoDB: If you created the table with a MySQL\n"
"InnoDB: version < 3.23.54 and did not define a primary\n"
"InnoDB: key, but defined a unique key with all non-NULL\n"
"InnoDB: columns, then MySQL internally treats that key\n"
"InnoDB: as the primary key. You can fix this error by\n"
"InnoDB: dump + DROP + CREATE + reimport of the table.\n",
name);
}
((row_prebuilt_t*)innobase_prebuilt)