diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-03-02 13:23:52 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-03-02 13:23:52 +0100 |
| commit | bfaebe3f5e4b917c4498e234bad7a9d45d07ca62 (patch) | |
| tree | d5f9b580b8298c368c983d1fe6510f2c0da959bd /client | |
| parent | f7f34f7e866fdf11662eb1053b15a36a7c0d4a2a (diff) | |
| parent | ceec7cea338e117d15a9679e517cc2bb24d44fcc (diff) | |
| download | mariadb-git-bfaebe3f5e4b917c4498e234bad7a9d45d07ca62.tar.gz | |
Further upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.1 to 5.5.
Also, take a syntax fix (C++ style comment in C file) in client/mysqldump.c.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqldump.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index 5773d61082a..cdda4f7a61d 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -2315,10 +2315,10 @@ static uint dump_routines_for_db(char *db) { if (opt_xml) { - if (i) // Procedures. + if (i) /* Procedures. */ print_xml_row(sql_file, "routine", routine_res, &row, "Create Procedure"); - else // Functions. + else /* Functions. */ print_xml_row(sql_file, "routine", routine_res, &row, "Create Function"); continue; |