database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

5.3->5.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2011-11-22 18:04:38 +01:00
parent af32b02c06 42221abaed
commit d2755a2c9c
394 changed files with 17631 additions and 3357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/mysql.cc
View File

@@ -46,7 +46,7 @@
#include <locale.h>
#endif
const char *VER= "15.0";
const char *VER= "15.1";
/* Don't try to make a nice table if the data is too big */
#define MAX_COLUMN_LENGTH 1024
@@ -2250,7 +2250,7 @@ static bool add_line(String &buffer,char *line,char *in_string,
break;
}
else if (!*in_string && inchar == '/' && *(pos+1) == '*' &&
*(pos+2) != '!')
!(*(pos+2) == '!' || (*(pos+2) == 'M' && *(pos+3) == '!')))
{
if (preserve_comments)
{