diff options
author | unknown <bell@sanja.is.com.ua> | 2004-11-13 23:26:15 +0200 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-11-13 23:26:15 +0200 |
commit | d18a91a90c9e2372f3df7b89d16b9941c87355fc (patch) | |
tree | cc7d933d9e54fec9d316c7e10ddf4869ee023a88 /mysql-test/r/view.result | |
parent | ac0cd2d3acd756b6917b7ea57d20ad5ea88b1999 (diff) | |
download | mariadb-git-d18a91a90c9e2372f3df7b89d16b9941c87355fc.tar.gz |
posmerge fixes
mysql-test/r/view.result:
erorr reported
sql/item.cc:
removed starnge code
sql/mysql_priv.h:
now error represented by Bool value
sql/sql_parse.cc:
removed old send_error calls
sql/sql_select.cc:
removed starnge code
sql/sql_show.cc:
show functions fixed
sql/table.h:
now error represented by Bool value
Diffstat (limited to 'mysql-test/r/view.result')
-rw-r--r-- | mysql-test/r/view.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/view.result b/mysql-test/r/view.result index 18fa7c2e374..f41e6c7e165 100644 --- a/mysql-test/r/view.result +++ b/mysql-test/r/view.result @@ -1221,11 +1221,11 @@ ERROR 42000: FUNCTION test.x1 does not exist show table status; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment t1 MyISAM 9 Fixed 0 0 0 21474836479 1024 0 NULL # # NULL latin1_swedish_ci NULL -v1 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL view +v1 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL FUNCTION test.x1 does not exist show table status; Name Engine Version Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment t1 MyISAM 9 Fixed 0 0 0 21474836479 1024 0 NULL # # NULL latin1_swedish_ci NULL -v1 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL view +v1 NULL NULL NULL NULL NULL NULL NULL NULL NULL NULL # # NULL NULL NULL NULL FUNCTION test.x1 does not exist drop view v1; drop table t1; create view v1 as select 99999999999999999999999999999999999999999999999999999 as col1; |