diff --git a/ChangeLog b/ChangeLog
index 1ccf1c24f..36c1ab444 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-02-14 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_properties_table_info.php: avoid errors #1046, no database selected
+      in MySQL 5.0.2
+
 2005-02-13 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/french update
     * server_privileges.php: bug #1118137, host not changing when editing user
diff --git a/tbl_properties_table_info.php b/tbl_properties_table_info.php
index 38ac81e4b..e4a56b118 100644
--- a/tbl_properties_table_info.php
+++ b/tbl_properties_table_info.php
@@ -21,6 +21,11 @@ global $showtable, $tbl_is_view, $tbl_type, $show_comment, $tbl_collation,
 /**
  * Gets table informations
  */
+
+// Seems we need to do this in MySQL 5.0.2,
+// otherwise error #1046, no database selected
+PMA_DBI_select_db($db);
+
 // The 'show table' statement works correct since 3.23.03
 $table_info_result   = PMA_DBI_query('SHOW TABLE STATUS LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\';');
 $showtable           = PMA_DBI_fetch_assoc($table_info_result);