database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge myoffice.izhnet.ru:/usr/home/gluh/MySQL/tmp_merge

Browse Source 
into  myoffice.izhnet.ru:/usr/home/gluh/MySQL/5.1


mysql-test/r/sp_notembedded.result:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
mysql-test/t/strict.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/handler.h:
  manual merge
sql/table.cc:
  manual merge
sql/unireg.cc:
  manual merge
tests/mysql_client_test.c:
  SCCS merged
This commit is contained in:
unknown
2006-07-18 18:43:55 +05:00
parent 98a63cde87 3e085bd882
commit 7f70e111dd
17 changed files with 377 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/mysql_client_test.c
View File

@ -8311,6 +8311,39 @@ static void test_list_fields()
}
static void test_bug19671()
{
MYSQL_RES *result;
int rc;
myheader("test_bug19671");
rc= mysql_query(mysql, "drop table if exists t1");
myquery(rc);
rc= mysql_query(mysql, "drop view if exists v1");
myquery(rc);
rc= mysql_query(mysql, "create table t1(f1 int)");
myquery(rc);
rc= mysql_query(mysql, "create view v1 as select va.* from t1 va");
myquery(rc);
result= mysql_list_fields(mysql, "v1", NULL);
mytest(result);
rc= my_process_result_set(result);
DIE_UNLESS(rc == 0);
verify_prepare_field(result, 0, "f1", "f1", MYSQL_TYPE_LONG,
"v1", "v1", current_db, 11, "0");
mysql_free_result(result);
myquery(mysql_query(mysql, "drop view v1"));
myquery(mysql_query(mysql, "drop table t1"));
}
/* Test a memory ovverun bug */
static void test_mem_overun()
@ -15455,6 +15488,7 @@ static struct my_tests_st my_tests[]= {
{ "test_bug14169", test_bug14169 },
{ "test_bug17667", test_bug17667 },
{ "test_mysql_insert_id", test_mysql_insert_id },
{ "test_bug19671", test_bug19671},
{ 0, 0 }
};