ninadsp
e7b130baf7
Merge remote branch 'origin/master'
2010-07-19 21:54:37 +05:30
Dieter Adriaenssens
e31dcc11ef
Merge branch 'QA_3_3'
...
Conflicts:
libraries/import.lib.php
2010-07-14 22:32:10 +02:00
Dieter Adriaenssens
dbe5daaad3
Converting number of Excel column names no longer limited
2010-07-14 22:29:26 +02:00
ninadsp
9dd93987ca
Reverted po files changes.
2010-07-15 00:17:49 +05:30
Dieter Adriaenssens
17fc1370f3
Merge branch 'QA_3_3'
...
Conflicts:
ChangeLog
libraries/import.lib.php
2010-07-13 23:27:15 +02:00
Dieter Adriaenssens
6648c620d9
Convert Excel column name correctly
2010-07-13 23:23:51 +02:00
Marc Delisle
c1be602a1e
fix merge conflicts
2010-07-08 07:52:47 -04:00
Marc Delisle
20d4c3a894
bug #3026400 [PHP] ereg functions are deprecated
2010-07-08 07:49:11 -04:00
ninadsp
a8d6f9ff4c
Merge remote branch 'origin/master'
2010-06-15 15:39:51 +05:30
Marc Delisle
f1d8953670
fix conflicts
2010-06-13 08:59:05 -04:00
Marc Delisle
ae8ddbf15b
bug #2986422 [import] Results for query are not displayed
2010-06-13 08:42:24 -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
632211d065
gettext conversion
2010-05-09 16:24:32 -04:00
Marc Delisle
2b4a5e68ee
gettext conversion
2010-05-09 08:03:11 -04:00
Dieter Adriaenssens
b8db7a63eb
merge QA_3_3
2010-05-03 23:25:49 +02:00
Dieter Adriaenssens
a3a47a429d
properly escape import value
2010-05-03 23:13:11 +02:00
Michal Čihař
07eca26675
Merge branch 'QA_3_3'
2010-03-31 14:26:08 +02:00
Nate
428ed49d17
patch #2979234 [import] Create tables with current charset and collation.
2010-03-31 14:25:41 +02:00
Michal Čihař
dea1cd19f0
Avoid duplicating the text.
2010-03-30 14:47:36 +02:00
Michal Čihař
fb21fc3ce0
Another conversion to ngettext.
2010-03-30 14:33:31 +02:00
Marc Delisle
819324ede6
remove author names, as discussed at the 2010 developer meeting and according to the book Producing Open Source Software
2010-03-06 18:04:17 +00:00
Marc Delisle
526dce65cb
3.3
2009-12-31 13:11:19 +00:00
Marc Delisle
f3833884e4
3.3
2009-12-31 13:09:18 +00:00
Marc Delisle
2519dd3855
code cleanup
2009-12-29 15:21:05 +00:00
Marc Delisle
15441ded5d
do not try to display a tab that was not built
2009-08-22 11:22:50 +00:00
Marc Delisle
e67f4cbc54
clarify function name
2009-06-24 11:34:56 +00:00
Marc Delisle
e2b0978a90
patch #2493494 Obsolete variable, thanks to Herman van Rink
2009-01-08 17:50:54 +00:00
Michal Čihař
56941e509c
Adding @package, second part.
2008-11-24 11:05:40 +00:00
Marc Delisle
91ae7b67bd
various code improvements, thanks to Piotr Przybylski
2008-08-16 12:17:52 +00:00
Marc Delisle
506d290408
bug #2004915 [bookmarks] Saved queries greater than 1000 chars not displayed
2008-08-01 20:02:21 +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
e9da128bc0
strRowsDeleted, strRowsAffected
2007-10-18 17:15:39 +00:00
Sebastian Mendel
585f991656
make use of PMA_Message
2007-10-16 09:30:13 +00:00
Sebastian Mendel
b2f3ae5fcf
make $sql_query persistent (init it, never unset it, always assume it is set)
2007-04-01 09:26:14 +00:00
Marc Delisle
b800466c91
avoid vim error on loading
2007-03-19 16:55:30 +00:00
Sebastian Mendel
e153586543
some doc and globals
2007-03-19 13:09:33 +00:00
Marc Delisle
42ac66ad74
get rid of propicon
2007-02-10 15:58:46 +00:00
Marc Delisle
0547dafd9b
bug #1603660 , incorrect escaping
2006-12-06 17:39:42 +00:00
Michal Čihař
fb9a3a598e
Check before commit!
2006-11-17 08:49:30 +00:00
Michal Čihař
54738174ee
Correctly fail if file is too short (bug #1574340 ).
2006-10-10 13:04:44 +00:00
Sebastian Mendel
1eadc0a41a
use @todo tag for todo items, to show up in generated documentation
2006-09-21 14:28:46 +00:00
Marc Delisle
32b1fb8039
support display of HANDLER statement results
2006-06-09 20:13:08 +00:00
Marc Delisle
1b5d1212dd
bug #1482841 , support USE statement in the import file
2006-05-14 11:47:56 +00:00
Michal Čihař
bfec931486
Improve functionality of limiting DROP DATABASE (bug #1456082 ).
2006-04-27 11:35:54 +00:00
Michal Čihař
56a0ec9638
Skip byte order marks (bug #1423362 ).
2006-02-21 20:28:27 +00:00
Sebastian Mendel
6b4f751e41
fixed bug #1409972 PHP 5.1.2 compatibility
2006-01-19 15:39:29 +00:00
Sebastian Mendel
0ae8842353
(not complete) PEAR coding standard
2006-01-17 17:03:02 +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ř
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
Sebastian Mendel
1db66739f8
fixed uninitialized variables
2005-10-14 14:15:06 +00:00
