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

Manual merge from mysql-next-mr.

Browse Source 
Conflicts:
  - sql/sql_yacc.yy
This commit is contained in:
Alexander Nozdrin
2009-12-02 18:50:14 +03:00
parent 0fe17677d8 e8e85ed2a6
commit f26ac4ba7a
176 changed files with 1208 additions and 2788 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/mysql_client_test.c
View File

@ -2117,7 +2117,7 @@ static void test_prepare_field_result()
myquery(rc);
rc= mysql_query(mysql, "CREATE TABLE test_prepare_field_result(int_c int, "
"var_c varchar(50), ts_c timestamp(14), "
"var_c varchar(50), ts_c timestamp, "
"char_c char(4), date_c date, extra tinyint)");
myquery(rc);
@ -4878,11 +4878,11 @@ static void test_fetch_date()
myquery(rc);
rc= mysql_query(mysql, "CREATE TABLE test_bind_result(c1 date, c2 time, \
c3 timestamp(14), \
c3 timestamp, \
c4 year, \
c5 datetime, \
c6 timestamp(4), \
c7 timestamp(6))");
c6 timestamp, \
c7 timestamp)");
myquery(rc);
rc= mysql_query(mysql, "SET SQL_MODE=''");
@ -5196,7 +5196,7 @@ static void test_prepare_ext()
" c12 numeric(8, 4),"
" c13 date,"
" c14 datetime,"
" c15 timestamp(14),"
" c15 timestamp,"
" c16 time,"
" c17 year,"
" c18 bit,"
@ -6230,7 +6230,7 @@ static void test_manual_sample()
}
if (mysql_query(mysql, "CREATE TABLE test_table(col1 int, col2 varchar(50), \
col3 smallint, \
col4 timestamp(14))"))
col4 timestamp)"))
{
fprintf(stderr, "\n create table failed");
fprintf(stderr, "\n %s", mysql_error(mysql));
@ -7140,7 +7140,7 @@ static void test_date()
rc= mysql_query(mysql, "DROP TABLE IF EXISTS test_date");
myquery(rc);
rc= mysql_query(mysql, "CREATE TABLE test_date(c1 TIMESTAMP(14), \
rc= mysql_query(mysql, "CREATE TABLE test_date(c1 TIMESTAMP, \
c2 TIME, \
c3 DATETIME, \
c4 DATE)");
@ -7206,10 +7206,10 @@ static void test_date_ts()
rc= mysql_query(mysql, "DROP TABLE IF EXISTS test_date");
myquery(rc);
rc= mysql_query(mysql, "CREATE TABLE test_date(c1 TIMESTAMP(10), \
c2 TIMESTAMP(14), \
rc= mysql_query(mysql, "CREATE TABLE test_date(c1 TIMESTAMP, \
c2 TIMESTAMP, \
c3 TIMESTAMP, \
c4 TIMESTAMP(6))");
c4 TIMESTAMP)");
myquery(rc);
@ -8897,7 +8897,7 @@ static void test_fetch_seek()
myquery(rc);
rc= mysql_query(mysql, "create table t1(c1 int primary key auto_increment, c2 char(10), c3 timestamp(14))");
rc= mysql_query(mysql, "create table t1(c1 int primary key auto_increment, c2 char(10), c3 timestamp)");
myquery(rc);
rc= mysql_query(mysql, "insert into t1(c2) values('venu'), ('mysql'), ('open'), ('source')");