Commit Graph

41 Commits

Author SHA1 Message Date
lorilee
2ebf96d242 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
Conflicts:
	libraries/display_export.lib.php
	libraries/display_import.lib.php
2010-07-20 13:04:03 -07:00
Michal Čihař
318dc4b650 Drop @version tag from docblocks. 2010-07-20 13:59:17 +02:00
lorilee
71ee3e6421 Fixed XHTML syntax problems 2010-06-18 16:12:41 -04:00
lorilee
30b4bc9944 Modified label text 2010-06-11 01:16:01 -04:00
Marc Delisle
b05a903dc3 gettext conversion 2010-05-14 07:47:50 -04:00
Marc Delisle
936472a758 patch #2915168 [import] Incorrect parsing of DELIMITER keyword 2009-12-17 17:54:53 +00:00
Marc Delisle
780e876f8d bug #2537766 [import] Comments are stripped when editing store procedures 2009-09-26 11:22:19 +00:00
Marc Delisle
9a35b4c823 bug #2634827 [import] Using DELIMITER produces infinite cycle 2009-07-04 19:00:39 +00:00
Marc Delisle
0ba3f15f3e revert bad fix of revision 12344 2009-04-17 16:58:53 +00:00
Marc Delisle
07673dcee9 bug #2634827 [import] Using DELIMITER ends with infinite cycle 2009-04-12 10:43:43 +00:00
Marc Delisle
2e8bff71ea bug #2650776 [import] SQL_MODE not saved during Partial Import 2009-04-08 11:47:25 +00:00
Michal Čihař
ebeb0c319f Adding @package, first part. 2008-11-24 10:32:56 +00:00
Marc Delisle
29d7c3e2f8 [import] Speed optimization to be able to import the sakila database 2008-07-14 15:28:58 +00:00
Marc Delisle
afbb2a9dc2 protection against XSS when register_globals is on and .htaccess has no effect 2008-06-21 15:01:27 +00:00
Marc Delisle
cec1847121 bug #1990342 [import] SQL file import very slow on Windows 2008-06-13 17:18:18 +00:00
Sebastian Mendel
b5ac463b81 bug #1798786 [import] Wrong error when a string contains semicolon 2007-12-18 09:27:12 +00:00
Marc Delisle
37ca5ac56d bug #1823045 [import] Error importing file with lowercase "delimiter" 2007-11-07 18:08:29 +00:00
Marc Delisle
c1f09816ee revert bad fix (revision 10720) 2007-10-08 20:52:25 +00:00
Marc Delisle
6057aaa33b avoid undefined variable next_quote 2007-10-05 16:54:00 +00:00
Marc Delisle
b74c793095 bug #1798786 [import] Wrong error message when a string contains semicolon 2007-10-04 17:29:15 +00:00
Marc Delisle
97f89ac682 replace various import options messages by just strOptions 2007-06-27 13:39:25 +00:00
Sebastian Mendel
cfeb306526 coding standard: no spaces inside braces 2007-04-01 11:02:46 +00:00
Sebastian Mendel
02ecd621bb return also works for includes ... so don't mess with intends 2007-03-29 11:45:12 +00:00
Sebastian Mendel
8e9bc00eab free memory! 2007-03-29 10:22:39 +00:00
Sebastian Mendel
374abd5173 fixed/added page level docblock 2007-03-20 10:32:13 +00:00
Sebastian Mendel
817e790762 synced/fixed vim line 2007-03-19 17:55:39 +00:00
Marc Delisle
b9951e8c44 patch 1647868, support handling of DELIMITER to mimic mysql CLI 2007-03-09 13:18:25 +00:00
Marc Delisle
6a76f4c544 bug #1469699, can't create stored procedure 2006-06-13 15:10:08 +00:00
Michal Čihař
b60fcde9ad Do not strip MySQL conditional statements in comments (patch #1459782, thanks to unconed - unconed). 2006-04-27 10:05:04 +00:00
Michal Čihař
8ece101046 Fix handling of -- (bug #1453430). 2006-03-23 16:58:58 +00:00
Michal Čihař
30bbf58924 Improve compatibility modes function, thanks to Sebastian. 2006-02-22 11:49:44 +00:00
Michal Čihař
e44872f959 Possibility to select SQL compatibility on import (RFE #1386132). 2006-02-22 10:20:01 +00:00
Sebastian Mendel
0ae8842353 (not complete) PEAR coding standard 2006-01-17 17:03:02 +00:00
Michal Čihař
fb7ba99648 Fix hang on unclosed quoted string (bug #1402270). 2006-01-11 10:52:45 +00:00
Michal Čihař
ccee74104a Handle correctly dumps with commented out commands (eg. from mysqldump). 2005-12-25 21:43:27 +00:00
Michal Čihař
3e79c53e3f Generic plugin infrastructure and use it in import (needed for RFE#1325937), work in progress. 2005-12-08 22:52:03 +00:00
Michal Čihař
898ee94c1a Fix query splitting in some cases (reported by Marc). 2005-11-20 23:58:29 +00:00
Michal Čihař
bdbe747f8f Fix query parsing when there is comment or string at the end. 2005-10-08 19:51:41 +00:00
Michal Čihař
9207ca3885 Fix import of queries containing `, fix import of queries not terminated by ;. 2005-10-08 10:01:25 +00:00
Michal Čihař
f58e0ae0ff Fix handling of whitespace at the end of imported file. 2005-10-06 08:41:22 +00:00
Michal Čihař
64bd56dfba Support for browsing selected columns (RFE #1275909). 2005-09-26 19:03:11 +00:00