database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint_11972

Browse Source 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-new-maint_11972


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
client/mysql_upgrade.c:
  Auto merged
include/config-netware.h:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/csv.result:
  manual merge
mysql-test/t/csv.test:
  manual merge
storage/csv/ha_tina.cc:
  manual merge
This commit is contained in:
unknown
2006-08-24 15:03:33 -04:00
parent fd989054c7 37c33a0ff6
commit 749242b683
13 changed files with 72 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/mysql_client_test.c
View File

@ -14993,8 +14993,6 @@ static void test_bug17667()
DIE("Read error");
}
}
/* Print the line */
printf("%s", line_buffer);
} while (my_memmem(line_buffer, MAX_TEST_QUERY_LENGTH*2,
statement_cursor->buffer, statement_cursor->length) == NULL);