Uncrustify maxscale
See script directory for method. The script to run in the top level MaxScale directory is called maxscale-uncrustify.sh, which uses another script, list-src, from the same directory (so you need to set your PATH). The uncrustify version was 0.66.
This commit is contained in:
@ -5,21 +5,25 @@
|
||||
*/
|
||||
|
||||
//
|
||||
//Markus Mäkelä 2014-08-08 10:09:48 UTC
|
||||
//The closing tag isn't properly detected when using inline comments.
|
||||
//Multiple commands cause this behaviour. The following commands cause these messages in the error log:
|
||||
// Markus Mäkelä 2014-08-08 10:09:48 UTC
|
||||
// The closing tag isn't properly detected when using inline comments.
|
||||
// Multiple commands cause this behaviour. The following commands cause these messages in the error log:
|
||||
|
||||
//select /* maxscale hintname prepare route to master */ @@server_id;
|
||||
//2014 08/08 13:01:09 Error : Syntax error in hint. Expected 'master', 'slave', or 'server' instead of '*/'. Hint ignored.
|
||||
// select /* maxscale hintname prepare route to master */ @@server_id;
|
||||
// 2014 08/08 13:01:09 Error : Syntax error in hint. Expected 'master', 'slave', or 'server' instead of
|
||||
// '*/'. Hint ignored.
|
||||
|
||||
//select /* maxscale hintname begin */ @@server_id;
|
||||
//2014 08/08 13:02:45 Error : Syntax error in hint. Expected '=', 'prepare', or 'start' instead of '@@server_id'. Hint ignored.
|
||||
// select /* maxscale hintname begin */ @@server_id;
|
||||
// 2014 08/08 13:02:45 Error : Syntax error in hint. Expected '=', 'prepare', or 'start' instead of
|
||||
// '@@server_id'. Hint ignored.
|
||||
|
||||
//The following only happens when no whitespace is used after 'master' and '*/':
|
||||
//select /* maxscale route to master*/ @@server_id;
|
||||
//2014 08/08 13:04:38 Error : Syntax error in hint. Expected 'master', 'slave', or 'server' instead of 'master*/'. Hint ignored.
|
||||
// The following only happens when no whitespace is used after 'master' and '*/':
|
||||
// select /* maxscale route to master*/ @@server_id;
|
||||
// 2014 08/08 13:04:38 Error : Syntax error in hint. Expected 'master', 'slave', or 'server' instead of
|
||||
// 'master*/'. Hint ignored.
|
||||
|
||||
//All other forms of '/* maxscale route to [slave|server <server name>]*/' work even without the whitespace before the closing tag.
|
||||
// All other forms of '/* maxscale route to [slave|server <server name>]*/' work even without the whitespace
|
||||
// before the closing tag.
|
||||
|
||||
|
||||
|
||||
@ -30,20 +34,22 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
int main(int argc, char* argv[])
|
||||
{
|
||||
|
||||
TestConnections * Test = new TestConnections(argc, argv);
|
||||
TestConnections* Test = new TestConnections(argc, argv);
|
||||
Test->set_timeout(10);
|
||||
|
||||
Test->maxscales->connect_maxscale(0);
|
||||
|
||||
Test->try_query(Test->maxscales->conn_rwsplit[0],
|
||||
(char *) "select /* maxscale hintname prepare route to master */ @@server_id;");
|
||||
Test->try_query(Test->maxscales->conn_rwsplit[0], (char *) "select /* maxscale hintname begin */ @@server_id;");
|
||||
Test->try_query(Test->maxscales->conn_rwsplit[0], (char *) "select /* maxscale route to master*/ @@server_id;");
|
||||
(char*) "select /* maxscale hintname prepare route to master */ @@server_id;");
|
||||
Test->try_query(Test->maxscales->conn_rwsplit[0],
|
||||
(char*) "select /* maxscale hintname begin */ @@server_id;");
|
||||
Test->try_query(Test->maxscales->conn_rwsplit[0],
|
||||
(char*) "select /* maxscale route to master*/ @@server_id;");
|
||||
|
||||
Test->check_log_err(0, (char *) "Syntax error in hint", false);
|
||||
Test->check_log_err(0, (char*) "Syntax error in hint", false);
|
||||
Test->check_maxscale_alive(0);
|
||||
int rval = Test->global_result;
|
||||
delete Test;
|
||||
|
||||
Reference in New Issue
Block a user