diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-02-07 15:47:24 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-02-07 15:47:24 +0200 |
| commit | d66e60248c9f448b9d251358e0acfd97d1e3f84e (patch) | |
| tree | 0661c54a51aa711947173e8a8e27e2e46cfa971c /mysql-test/r/rpl_master_pos_wait.result | |
| parent | 2ff82a7b152181a49814f5ea125ca8dc6551fbdd (diff) | |
| download | mariadb-git-d66e60248c9f448b9d251358e0acfd97d1e3f84e.tar.gz | |
After merge fixes & remove compiler warnings
Added lengths for all MYSQL_FIELD string parameters
Changed field length to 2 byte in .frm files
configure.in:
After merge fixes
include/ft_global.h:
Fixed copyright
include/my_sys.h:
Remove compiler warnings
include/mysql.h:
Added lengths for all MYSQL_FIELD string parameters
include/mysql_com.h:
Remove compiler warning
myisam/ft_boolean_search.c:
Removed compiler warnings
myisam/ft_dump.c:
Removed compiler warnings
myisam/ft_stopwords.c:
Copy file from MySQL 4.0
myisam/mi_delete.c:
Fixed compiler warning
myisam/sort.c:
Indentation changes
myisam/sp_test.c:
Remove compiler warnings
mysql-test/r/func_group.result:
After merge fixes
mysql-test/r/group_by.result:
After merge fixes
mysql-test/r/rpl_insert_id.result:
After merge fixes
mysql-test/r/rpl_master_pos_wait.result:
After merge fixes
mysql-test/t/rpl000009.test:
After merge fixes
mysql-test/t/rpl_insert_id.test:
After merge fixes
mysql-test/t/subselect.test:
After merge fixes
sql/item_cmpfunc.cc:
After merge fixes
sql/item_cmpfunc.h:
After merge fixes
sql/item_func.cc:
After merge fixes
sql/item_func.h:
After merge fixes
sql/item_strfunc.cc:
After merge fixes
sql/item_strfunc.h:
After merge fixes
sql/log.cc:
After merge fixes
sql/mysql_priv.h:
After merge fixes
sql/mysqld.cc:
After merge fixes
sql/sql_db.cc:
After merge fixes
sql/sql_handler.cc:
After merge fixes
sql/sql_parse.cc:
After merge fixes
sql/sql_show.cc:
After merge fixes
sql/sql_udf.cc:
After merge fixes
sql/table.cc:
Changed field length to 2 byte in .frm files
sql/unireg.cc:
Changed field length to 2 byte in .frm files
Diffstat (limited to 'mysql-test/r/rpl_master_pos_wait.result')
| -rw-r--r-- | mysql-test/r/rpl_master_pos_wait.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/rpl_master_pos_wait.result b/mysql-test/r/rpl_master_pos_wait.result index 22c7aef621c..801ffad6975 100644 --- a/mysql-test/r/rpl_master_pos_wait.result +++ b/mysql-test/r/rpl_master_pos_wait.result @@ -1,9 +1,9 @@ -slave stop; +stop slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; -slave start; +start slave; select master_pos_wait('master-bin.999999',0,10); master_pos_wait('master-bin.999999',0,10) -1 |