diff options
| author | unknown <monty@mysql.com> | 2004-12-06 17:15:54 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-12-06 17:15:54 +0200 |
| commit | a1fba2daccee3c7c5d46cded39fda7ee7f0d6eae (patch) | |
| tree | adca7e39f11a6ff5883c21958f614b2e665a3d84 /mysql-test/r/drop_temp_table.result | |
| parent | 796bd7de96a1d1ec422708b90df5328388201c10 (diff) | |
| download | mariadb-git-a1fba2daccee3c7c5d46cded39fda7ee7f0d6eae.tar.gz | |
After merge fixes
Fixed compiler warnings
Fix core dump when sending SIGHUP to mysqld
mysql-test/r/drop_temp_table.result:
After merge fixes
mysql-test/r/grant.result:
After merge fixes
mysql-test/r/group_min_max.result:
After merge fixes
mysql-test/r/innodb.result:
After merge fixes
mysql-test/r/insert_select.result:
After merge fixes
mysql-test/r/rpl_charset.result:
After merge fixes
mysql-test/r/rpl_create_database.result:
After merge fixes
mysql-test/r/rpl_loaddata_rule_m.result:
After merge fixes
mysql-test/t/rpl_charset.test:
After merge fixes
mysql-test/t/rpl_create_database.test:
After merge fixes
sql-common/client.c:
After merge fixes
sql/item.cc:
After merge fixes
sql/mysqld.cc:
Fix core dump when sending SIGHUP to mysqld
sql/sql_acl.cc:
Better comment
sql/sql_derived.cc:
Fixed comment
Added missing DBUG_RETURN
sql/sql_insert.cc:
Fixed compiler warnings
After merge fixes
sql/sql_lex.cc:
After merge fixes
Removed compiler warnings
sql/sql_parse.cc:
After merge fixes
sql/sql_select.cc:
More debugging
sql/sql_table.cc:
Added missing DBUG_VOID_RETURN
sql/sql_update.cc:
Fixed compiler warning
sql/sql_view.cc:
Added missing DBUG_RETURN
Fixed compiler warnings
Added flag to signal that the view is a derived table
Diffstat (limited to 'mysql-test/r/drop_temp_table.result')
| -rw-r--r-- | mysql-test/r/drop_temp_table.result | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/r/drop_temp_table.result b/mysql-test/r/drop_temp_table.result index 08793bcbd57..34c08f08788 100644 --- a/mysql-test/r/drop_temp_table.result +++ b/mysql-test/r/drop_temp_table.result @@ -11,8 +11,8 @@ get_lock("a",10) show binlog events; Log_name Pos Event_type Server_id End_log_pos Info master-bin.000001 4 Format_desc 1 95 Server ver: VERSION, Binlog ver: 4 -master-bin.000001 95 Query 1 190 use `test`; create database `drop-temp+table-test` -master-bin.000001 190 Query 1 306 use `drop-temp+table-test`; create temporary table `table:name` (a int) -master-bin.000001 306 Query 1 457 use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name` -master-bin.000001 457 Query 1 550 use `drop-temp+table-test`; DO RELEASE_LOCK("a") +master-bin.000001 95 Query 1 206 create database `drop-temp+table-test` +master-bin.000001 206 Query 1 322 use `drop-temp+table-test`; create temporary table `table:name` (a int) +master-bin.000001 322 Query 1 473 use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `drop-temp+table-test`.`table:name` +master-bin.000001 473 Query 1 566 use `drop-temp+table-test`; DO RELEASE_LOCK("a") drop database `drop-temp+table-test`; |