Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9c4a7a13307143fbbf2abbf20b88514dffd4e821 https://github.com/phpmyadmin/phpmyadmin/commit/9c4a7a13307143fbbf2abbf20b88... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2013-02-03 (Sun, 03 Feb 2013)

Changed paths: M libraries/server_privileges.lib.php M server_privileges.php

Log Message: ----------- Fix SQL syntax error when creating a user with privileges for a specific database

Commit: 5471e912dd8cf39de68282ac30778e3be5850328 https://github.com/phpmyadmin/phpmyadmin/commit/5471e912dd8cf39de68282ac3077... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2013-02-03 (Sun, 03 Feb 2013)

Changed paths: M js/keyhandler.js M libraries/Header.class.php M libraries/StorageEngine.class.php M libraries/engines/bdb.lib.php M libraries/engines/binlog.lib.php M libraries/engines/innodb.lib.php M libraries/engines/mrg_myisam.lib.php A libraries/engines/performance_schema.lib.php M libraries/tbl_columns_definition_form.inc.php M tbl_change.php M test/engines/PMA_StorageEngine_innodb_test.php M test/engines/PMA_StorageEngine_mrg_myisam_test.php

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6b9767cf348d...5471e912dd8c