Marc Delisle
e1f019b2dc
Clarify the option about INSERT IGNORE
2010-11-10 05:50:59 -05:00
Michal Čihař
d17fba309c
Fix permissions.
...
Most files were made executable somewhere in ninadsp tree, reverting
this.
2010-08-30 09:53:37 +02:00
ninadsp
c9253c0a0e
Merge conflict resolved for Lori's tree merge to main
2010-08-22 12:42:54 +05:30
ninadsp
e646a2760c
Fixed conflict due to upstream merge
2010-07-23 21:59:15 +05:30
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
ninadsp
160f4314eb
Merge remote branch 'origin/master'
2010-06-03 22:34:52 +05:30
Marc Delisle
caa98445d8
conform to relational terminology regarding columns and rows
2010-05-31 14:33:21 -04:00
ninadsp
bed1948d04
testing git setup - no major change made in code yet
...
only added a few comments
2010-05-23 01:22:01 +05:30
Marc Delisle
b05a903dc3
gettext conversion
2010-05-14 07:47:50 -04:00
Marc Delisle
7925c03896
gettext conversion
2010-05-11 13:05:43 -04:00
Michal Čihař
20925728e7
Replace other usages of deprecated split().
2010-04-22 20:21:07 +02:00
Michal Čihař
28b8e9448a
rfe #1927189 strip ` from column names on import
2008-11-30 14:20:25 +00:00
Michal Čihař
ebeb0c319f
Adding @package, first part.
2008-11-24 10:32:56 +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
Sebastian Mendel
8cd87d9e46
make use of PMA_Message
2007-10-16 09:16:41 +00:00
Sebastian Mendel
cb94302703
removed MySQL < 5 code
2007-10-02 08:49:19 +00:00
Marc Delisle
97f89ac682
replace various import options messages by just strOptions
2007-06-27 13:39:25 +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
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
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ř
7870ee574d
Fix import of some CSV files (bug #1373731 ), provide better error messages.
2005-12-05 22:53:24 +00:00
Michal Čihař
f9ab10666a
CSV import fixes:
...
- Drop optional escaping as this should not have any real functionality.
- Do not overwrite error message from import in case of single SQL query is being executed.
- Make enclosing behaviour same as in MySQL LOAD DATA (bug #1363532 ).
2005-11-23 10:34:52 +00:00
Marc Delisle
90f8f6b1fe
typo
2005-10-08 11:38:29 +00:00
Michal Čihař
6c09b4bd58
This one does not handle charset conversion.
2005-10-08 09:14:36 +00:00
Michal Čihař
64bd56dfba
Support for browsing selected columns (RFE #1275909 ).
2005-09-26 19:03:11 +00:00
