diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-01-04 15:37:20 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-01-04 15:37:20 +0200 |
| commit | e229fe9801cc9fb7e3783cf708bc7cb695606c64 (patch) | |
| tree | aa5cff7e153050d86b7effd693496f071d21e24a /mysql-test | |
| parent | eebc67f6f8df9e0bdcde7770e383992ff6cad451 (diff) | |
| download | mariadb-git-e229fe9801cc9fb7e3783cf708bc7cb695606c64.tar.gz | |
Added support for DROP TEMPORARY TABLE
Removed mysql_warnings() API function.
Post merge fixes.
client/mysqltest.c:
Don't use mysql_warnings().
include/mysql.h:
Removed mysql_warnings() API function
libmysql/libmysql.c:
Removed mysql_warnings() API function
mysql-test/r/rpl_log_pos.result:
Updated results
mysql-test/t/connect.test:
Removed empty lines
mysql-test/t/rpl_log_pos.test:
Update to new syntax
sql/item.h:
Fix after merge
sql/item_create.cc:
Fix after merge
sql/mysql_priv.h:
Added support for DROP TEMPORARY TABLE
sql/sql_db.cc:
Added support for DROP TEMPORARY TABLE
sql/sql_parse.cc:
SHOW WARNINGS now shows notes, warnings and errors.
Support for DROP TEMPORARY TABLE
Post merge fixes
sql/sql_repl.cc:
Post merge fixes
sql/sql_table.cc:
Added support for DROP TEMPORARY TABLE
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/rpl_log_pos.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/connect.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/rpl_log_pos.test | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/mysql-test/r/rpl_log_pos.result b/mysql-test/r/rpl_log_pos.result index 4ba3736604e..fa38e42ae73 100644 --- a/mysql-test/r/rpl_log_pos.result +++ b/mysql-test/r/rpl_log_pos.result @@ -10,9 +10,9 @@ master-bin.000001 79 show slave status; Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space 127.0.0.1 root MASTER_PORT 1 master-bin.000001 79 slave-relay-bin.000002 123 master-bin.000001 Yes Yes 0 0 79 127 -slave stop; +stop slave; change master to master_log_pos=73; -slave start; +start slave; stop slave; change master to master_log_pos=73; show slave status; @@ -35,7 +35,7 @@ create table if not exists t1 (n int); drop table if exists t1; create table t1 (n int); insert into t1 values (1),(2),(3); -slave stop; +stop slave; change master to master_log_pos=79; start slave; select * from t1; diff --git a/mysql-test/t/connect.test b/mysql-test/t/connect.test index 0bc5ca3914f..192d3eaf3e0 100644 --- a/mysql-test/t/connect.test +++ b/mysql-test/t/connect.test @@ -63,5 +63,3 @@ show tables; #--error 1045 #connect (con1,localhost,test,zorro,); #--error 1045 - - diff --git a/mysql-test/t/rpl_log_pos.test b/mysql-test/t/rpl_log_pos.test index 03c86137ae0..bc1349a959a 100644 --- a/mysql-test/t/rpl_log_pos.test +++ b/mysql-test/t/rpl_log_pos.test @@ -6,9 +6,9 @@ show master status; sync_slave_with_master; --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT show slave status; -slave stop; +stop slave; change master to master_log_pos=73; -slave start; +start slave; sleep 5; stop slave; @@ -19,7 +19,7 @@ start slave; sleep 5; --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT show slave status; -slave stop; +stop slave; change master to master_log_pos=173; --replace_result 3306 MASTER_PORT 9306 MASTER_PORT 3334 MASTER_PORT 3336 MASTER_PORT start slave; @@ -34,7 +34,7 @@ create table t1 (n int); insert into t1 values (1),(2),(3); save_master_pos; connection slave; -slave stop; +stop slave; change master to master_log_pos=79; start slave; sync_with_master; |