diff options
| author | unknown <monty@mysql.com> | 2005-01-04 13:46:53 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-01-04 13:46:53 +0200 |
| commit | bd365f76222e6263095e079ab9e634e88f06b7e1 (patch) | |
| tree | d360ddc93c589f0b29af048f743def5cd7593d6c /mysql-test/r/view.result | |
| parent | 6d0443331ac989415b71adc795c8850a7b19dd98 (diff) | |
| download | mariadb-git-bd365f76222e6263095e079ab9e634e88f06b7e1.tar.gz | |
After merge fixes
Add support for warnings for prepare of prepared statements
Fixed test to work with --ps-protocol
Fixed some test results
libmysql/libmysql.c:
Add support for warnings for prepare of prepared statements
mysql-test/r/func_concat.result:
After merge fixes
mysql-test/r/select.result:
Delete conflicting tables form previous tests
mysql-test/r/view.result:
New code from 4.1 fixed old error
mysql-test/t/create.test:
Ensure that --ps-protocol return same results as normal test
mysql-test/t/func_group.test:
Remove not needed --disable_ps_protocol
mysql-test/t/func_time.test:
Ensure that --ps-protocol return same results as normal test
mysql-test/t/having.test:
Ensure that --ps-protocol return same results as normal test
mysql-test/t/insert_select.test:
Remove not needed --disable_ps_protocol
mysql-test/t/select.test:
Ensure that --ps-protocol return same results as normal test
mysql-test/t/sp.test:
Fixed comment
mysql-test/t/system_mysql_db_fix.test:
Fix that results is same as from system_mysql_db.test
mysql-test/t/trigger.test:
Added comment
mysql-test/t/type_blob.test:
Remove not needed --disable_ps_protocol
mysql-test/t/union.test:
Run most of the test with --ps-protocol
mysql-test/t/user_limits.test:
Ensure that --ps-protocol return same results as normal test
mysql-test/t/view.test:
Removed --error as bug is now fixed
mysql-test/t/warnings.test:
Ensure that --ps-protocol return same results as normal test
ndb/include/Makefile.am:
Don't automaticly use SCCS files
sql/ha_ndbcluster.cc:
Removed compiler warning
sql/log_event.cc:
After merge fix
sql/sql_class.h:
After merge fix
sql/sql_insert.cc:
After merge fix
sql/sql_load.cc:
After merge fix
sql/sql_prepare.cc:
Add support for warnings for prepare of prepared statements
sql/sql_update.cc:
After merge fixes
Diffstat (limited to 'mysql-test/r/view.result')
| -rw-r--r-- | mysql-test/r/view.result | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 8013521e2f4..d31575eb38e 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -1433,7 +1433,8 @@ insert into v1 values (1) on duplicate key update a=2; insert into v1 values (1) on duplicate key update a=2; ERROR HY000: CHECK OPTION failed 'test.v1' insert ignore into v1 values (1) on duplicate key update a=2; -ERROR HY000: CHECK OPTION failed 'test.v1' +Warnings: +Error 1369 CHECK OPTION failed 'test.v1' select * from t1; a 1 |