From f0068bad367cf16b6b358520a30bc5f3a051497d Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@FreeBSD.org>
Date: Fri, 21 Nov 2003 19:44:24 +0000
Subject: [PATCH] Add files I missed in my previous commit.

---
 .../files/fix-libraries::display_tbl.lib.php  | 11 ++++++
 .../files/fix-libraries::display_tbl.lib.php3 | 11 ++++++
 .../phpmyadmin/files/fix-tbl_relation.php     | 36 +++++++++++++++++++
 .../phpmyadmin/files/fix-tbl_relation.php3    | 36 +++++++++++++++++++
 .../files/fix-libraries::display_tbl.lib.php  | 11 ++++++
 .../files/fix-libraries::display_tbl.lib.php3 | 11 ++++++
 .../phpmyadmin211/files/fix-tbl_relation.php  | 36 +++++++++++++++++++
 .../phpmyadmin211/files/fix-tbl_relation.php3 | 36 +++++++++++++++++++
 8 files changed, 188 insertions(+)
 create mode 100644 databases/phpmyadmin/files/fix-libraries::display_tbl.lib.php
 create mode 100644 databases/phpmyadmin/files/fix-libraries::display_tbl.lib.php3
 create mode 100644 databases/phpmyadmin/files/fix-tbl_relation.php
 create mode 100644 databases/phpmyadmin/files/fix-tbl_relation.php3
 create mode 100644 databases/phpmyadmin211/files/fix-libraries::display_tbl.lib.php
 create mode 100644 databases/phpmyadmin211/files/fix-libraries::display_tbl.lib.php3
 create mode 100644 databases/phpmyadmin211/files/fix-tbl_relation.php
 create mode 100644 databases/phpmyadmin211/files/fix-tbl_relation.php3

diff --git a/databases/phpmyadmin/files/fix-libraries::display_tbl.lib.php b/databases/phpmyadmin/files/fix-libraries::display_tbl.lib.php
new file mode 100644
index 000000000000..03fff8091d19
--- /dev/null
+++ b/databases/phpmyadmin/files/fix-libraries::display_tbl.lib.php
@@ -0,0 +1,11 @@
+--- libraries/display_tbl.lib.php.orig	Sat Oct 18 23:32:07 2003
++++ libraries/display_tbl.lib.php	Mon Nov  3 15:32:22 2003
+@@ -541,7 +541,7 @@
+             echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n";
+             echo $GLOBALS['strSortByKey'] . ': <select name="sql_query">&nbsp;';
+             $used_index = false;
+-            $local_order = str_replace('  ', ' ', $sql_order);
++            $local_order = (isset($sql_order) ? str_replace('  ', ' ', $sql_order) : '');
+             while (list($key, $val) = each($indexes_data)) {
+                 $asc_sort = 'ORDER BY ';
+                 $desc_sort = 'ORDER BY ';
diff --git a/databases/phpmyadmin/files/fix-libraries::display_tbl.lib.php3 b/databases/phpmyadmin/files/fix-libraries::display_tbl.lib.php3
new file mode 100644
index 000000000000..03fff8091d19
--- /dev/null
+++ b/databases/phpmyadmin/files/fix-libraries::display_tbl.lib.php3
@@ -0,0 +1,11 @@
+--- libraries/display_tbl.lib.php.orig	Sat Oct 18 23:32:07 2003
++++ libraries/display_tbl.lib.php	Mon Nov  3 15:32:22 2003
+@@ -541,7 +541,7 @@
+             echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n";
+             echo $GLOBALS['strSortByKey'] . ': <select name="sql_query">&nbsp;';
+             $used_index = false;
+-            $local_order = str_replace('  ', ' ', $sql_order);
++            $local_order = (isset($sql_order) ? str_replace('  ', ' ', $sql_order) : '');
+             while (list($key, $val) = each($indexes_data)) {
+                 $asc_sort = 'ORDER BY ';
+                 $desc_sort = 'ORDER BY ';
diff --git a/databases/phpmyadmin/files/fix-tbl_relation.php b/databases/phpmyadmin/files/fix-tbl_relation.php
new file mode 100644
index 000000000000..8b52da006901
--- /dev/null
+++ b/databases/phpmyadmin/files/fix-tbl_relation.php
@@ -0,0 +1,36 @@
+retrieving revision 1.38
+retrieving revision 1.39
+diff -u -r1.38 -r1.39
+--- tbl_relation.php.orig	2003/09/09 08:26:43	1.38
++++ tbl_relation.php		2003/10/21 17:08:20	1.39
+@@ -1,5 +1,5 @@
+ <?php
+-/* $Id: tbl_relation.php,v 1.38 2003/09/09 08:26:43 nijel Exp $ */
++/* $Id: tbl_relation.php,v 1.39 2003/10/21 17:08:20 lem9 Exp $ */
+ // vim: expandtab sw=4 ts=4 sts=4:
+ 
+ /**
+@@ -280,6 +280,9 @@
+                         $selectboxall[$field_full] =  $field_v;
+                         // there could be more than one segment of the primary
+                         // so do not break
++
++                        // Please watch here, tbl_type is INNODB but the
++                        // resulting value of SHOW KEYS is InnoDB
+                       
+                         if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
+                         $selectboxall_innodb[$field_full] =  $field_v;
+@@ -295,6 +298,13 @@
+                         if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
+                         $selectboxall_innodb[$field_full] =  $field_v;
+                         }
++
++                    // for InnoDB, any index is allowed
++                    } else if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
++                        $field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
++                        $field_v    = $curr_field['Table'] . '->' . $curr_field['Column_name'];
++                        $selectboxall_innodb[$field_full] =  $field_v;
++
+                     } // end if
+                 } // end while over keys
+             } // end if (mysql_num_rows)
diff --git a/databases/phpmyadmin/files/fix-tbl_relation.php3 b/databases/phpmyadmin/files/fix-tbl_relation.php3
new file mode 100644
index 000000000000..8b52da006901
--- /dev/null
+++ b/databases/phpmyadmin/files/fix-tbl_relation.php3
@@ -0,0 +1,36 @@
+retrieving revision 1.38
+retrieving revision 1.39
+diff -u -r1.38 -r1.39
+--- tbl_relation.php.orig	2003/09/09 08:26:43	1.38
++++ tbl_relation.php		2003/10/21 17:08:20	1.39
+@@ -1,5 +1,5 @@
+ <?php
+-/* $Id: tbl_relation.php,v 1.38 2003/09/09 08:26:43 nijel Exp $ */
++/* $Id: tbl_relation.php,v 1.39 2003/10/21 17:08:20 lem9 Exp $ */
+ // vim: expandtab sw=4 ts=4 sts=4:
+ 
+ /**
+@@ -280,6 +280,9 @@
+                         $selectboxall[$field_full] =  $field_v;
+                         // there could be more than one segment of the primary
+                         // so do not break
++
++                        // Please watch here, tbl_type is INNODB but the
++                        // resulting value of SHOW KEYS is InnoDB
+                       
+                         if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
+                         $selectboxall_innodb[$field_full] =  $field_v;
+@@ -295,6 +298,13 @@
+                         if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
+                         $selectboxall_innodb[$field_full] =  $field_v;
+                         }
++
++                    // for InnoDB, any index is allowed
++                    } else if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
++                        $field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
++                        $field_v    = $curr_field['Table'] . '->' . $curr_field['Column_name'];
++                        $selectboxall_innodb[$field_full] =  $field_v;
++
+                     } // end if
+                 } // end while over keys
+             } // end if (mysql_num_rows)
diff --git a/databases/phpmyadmin211/files/fix-libraries::display_tbl.lib.php b/databases/phpmyadmin211/files/fix-libraries::display_tbl.lib.php
new file mode 100644
index 000000000000..03fff8091d19
--- /dev/null
+++ b/databases/phpmyadmin211/files/fix-libraries::display_tbl.lib.php
@@ -0,0 +1,11 @@
+--- libraries/display_tbl.lib.php.orig	Sat Oct 18 23:32:07 2003
++++ libraries/display_tbl.lib.php	Mon Nov  3 15:32:22 2003
+@@ -541,7 +541,7 @@
+             echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n";
+             echo $GLOBALS['strSortByKey'] . ': <select name="sql_query">&nbsp;';
+             $used_index = false;
+-            $local_order = str_replace('  ', ' ', $sql_order);
++            $local_order = (isset($sql_order) ? str_replace('  ', ' ', $sql_order) : '');
+             while (list($key, $val) = each($indexes_data)) {
+                 $asc_sort = 'ORDER BY ';
+                 $desc_sort = 'ORDER BY ';
diff --git a/databases/phpmyadmin211/files/fix-libraries::display_tbl.lib.php3 b/databases/phpmyadmin211/files/fix-libraries::display_tbl.lib.php3
new file mode 100644
index 000000000000..03fff8091d19
--- /dev/null
+++ b/databases/phpmyadmin211/files/fix-libraries::display_tbl.lib.php3
@@ -0,0 +1,11 @@
+--- libraries/display_tbl.lib.php.orig	Sat Oct 18 23:32:07 2003
++++ libraries/display_tbl.lib.php	Mon Nov  3 15:32:22 2003
+@@ -541,7 +541,7 @@
+             echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n";
+             echo $GLOBALS['strSortByKey'] . ': <select name="sql_query">&nbsp;';
+             $used_index = false;
+-            $local_order = str_replace('  ', ' ', $sql_order);
++            $local_order = (isset($sql_order) ? str_replace('  ', ' ', $sql_order) : '');
+             while (list($key, $val) = each($indexes_data)) {
+                 $asc_sort = 'ORDER BY ';
+                 $desc_sort = 'ORDER BY ';
diff --git a/databases/phpmyadmin211/files/fix-tbl_relation.php b/databases/phpmyadmin211/files/fix-tbl_relation.php
new file mode 100644
index 000000000000..8b52da006901
--- /dev/null
+++ b/databases/phpmyadmin211/files/fix-tbl_relation.php
@@ -0,0 +1,36 @@
+retrieving revision 1.38
+retrieving revision 1.39
+diff -u -r1.38 -r1.39
+--- tbl_relation.php.orig	2003/09/09 08:26:43	1.38
++++ tbl_relation.php		2003/10/21 17:08:20	1.39
+@@ -1,5 +1,5 @@
+ <?php
+-/* $Id: tbl_relation.php,v 1.38 2003/09/09 08:26:43 nijel Exp $ */
++/* $Id: tbl_relation.php,v 1.39 2003/10/21 17:08:20 lem9 Exp $ */
+ // vim: expandtab sw=4 ts=4 sts=4:
+ 
+ /**
+@@ -280,6 +280,9 @@
+                         $selectboxall[$field_full] =  $field_v;
+                         // there could be more than one segment of the primary
+                         // so do not break
++
++                        // Please watch here, tbl_type is INNODB but the
++                        // resulting value of SHOW KEYS is InnoDB
+                       
+                         if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
+                         $selectboxall_innodb[$field_full] =  $field_v;
+@@ -295,6 +298,13 @@
+                         if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
+                         $selectboxall_innodb[$field_full] =  $field_v;
+                         }
++
++                    // for InnoDB, any index is allowed
++                    } else if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
++                        $field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
++                        $field_v    = $curr_field['Table'] . '->' . $curr_field['Column_name'];
++                        $selectboxall_innodb[$field_full] =  $field_v;
++
+                     } // end if
+                 } // end while over keys
+             } // end if (mysql_num_rows)
diff --git a/databases/phpmyadmin211/files/fix-tbl_relation.php3 b/databases/phpmyadmin211/files/fix-tbl_relation.php3
new file mode 100644
index 000000000000..8b52da006901
--- /dev/null
+++ b/databases/phpmyadmin211/files/fix-tbl_relation.php3
@@ -0,0 +1,36 @@
+retrieving revision 1.38
+retrieving revision 1.39
+diff -u -r1.38 -r1.39
+--- tbl_relation.php.orig	2003/09/09 08:26:43	1.38
++++ tbl_relation.php		2003/10/21 17:08:20	1.39
+@@ -1,5 +1,5 @@
+ <?php
+-/* $Id: tbl_relation.php,v 1.38 2003/09/09 08:26:43 nijel Exp $ */
++/* $Id: tbl_relation.php,v 1.39 2003/10/21 17:08:20 lem9 Exp $ */
+ // vim: expandtab sw=4 ts=4 sts=4:
+ 
+ /**
+@@ -280,6 +280,9 @@
+                         $selectboxall[$field_full] =  $field_v;
+                         // there could be more than one segment of the primary
+                         // so do not break
++
++                        // Please watch here, tbl_type is INNODB but the
++                        // resulting value of SHOW KEYS is InnoDB
+                       
+                         if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
+                         $selectboxall_innodb[$field_full] =  $field_v;
+@@ -295,6 +298,13 @@
+                         if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
+                         $selectboxall_innodb[$field_full] =  $field_v;
+                         }
++
++                    // for InnoDB, any index is allowed
++                    } else if ($tbl_type=='INNODB' && isset($curr_table[1]) && $curr_table[1]=='InnoDB') {
++                        $field_full = $db . '.' . $curr_field['Table'] . '.' . $curr_field['Column_name'];
++                        $field_v    = $curr_field['Table'] . '->' . $curr_field['Column_name'];
++                        $selectboxall_innodb[$field_full] =  $field_v;
++
+                     } // end if
+                 } // end while over keys
+             } // end if (mysql_num_rows)