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 sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt

Browse Source 
into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


client/mysqldump.c:
  Auto merged
mysql-test/r/func_math.result:
  Auto merged
mysql-test/r/func_misc.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/view_grant.result:
  Auto merged
mysql-test/t/func_math.test:
  Auto merged
mysql-test/t/func_misc.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/view_grant.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/client_priv.h:
  manual merge
This commit is contained in:
unknown
2007-10-04 17:13:57 +05:00
parent 6356f16196 fca5cbe660
commit f2302e5530
8 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/mysql_client_test.c
View File

@ -16035,13 +16035,15 @@ static void test_bug21635()
{
field= mysql_fetch_field_direct(result, i);
if (!opt_silent)
printf("%s -> %s ... ", expr[i * 2], field->name);
if (!opt_silent)
printf("%s -> %s ... ", expr[i * 2], field->name);
fflush(stdout);
DIE_UNLESS(field->db[0] == 0 && field->org_table[0] == 0 &&
field->table[0] == 0 && field->org_name[0] == 0);
DIE_UNLESS(strcmp(field->name, expr[i * 2 + 1]) == 0);
if (!opt_silent)
puts("OK");
if (!opt_silent)
puts("OK");
}
mysql_free_result(result);