Branch: refs/heads/QA_4_4
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: cc56e0966718fbf1dc56b37f9a8c151b15722a7f
      
https://github.com/phpmyadmin/phpmyadmin/commit/cc56e0966718fbf1dc56b37f9a8c151b15722a7f
  Author: Andrea Vallorani <andrea.vallor...@gmail.com>
  Date:   2015-03-29 (Sun, 29 Mar 2015)

  Changed paths:
    M libraries/import.lib.php

  Log Message:
  -----------
  Bug #4718 simulate query fails

It is not an elegant solution, but it seems functional.
It avoids all the errors caused by the presence of functions in the query.
The $extra_where_clause variable was valorized but never appended to the WHERE 
clause. (I think that was a mistake)

Signed-off-by: Andrea Vallorani <andrea.vallor...@gmail.com>


  Commit: adfd70d2901b41da7c05c9dfd22e9e930301b007
      
https://github.com/phpmyadmin/phpmyadmin/commit/adfd70d2901b41da7c05c9dfd22e9e930301b007
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2015-03-29 (Sun, 29 Mar 2015)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <m...@infomarc.info>


  Commit: b28ae18f2287c88ecab287b64e6542076b997e1f
      
https://github.com/phpmyadmin/phpmyadmin/commit/b28ae18f2287c88ecab287b64e6542076b997e1f
  Author: Marc Delisle <m...@infomarc.info>
  Date:   2015-03-29 (Sun, 29 Mar 2015)

  Changed paths:
    M ChangeLog
    M libraries/import.lib.php

  Log Message:
  -----------
  Merge branch 'QA_4_3' into QA_4_4


Compare: 
https://github.com/phpmyadmin/phpmyadmin/compare/22199cd89d3e...b28ae18f2287
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git

Reply via email to