diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-11 19:39:43 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-01-11 19:39:43 +0200 |
| commit | e689fbc4582de1b5f81cb69d98f5fe54b7064db1 (patch) | |
| tree | 77b755832a75628eaf9d6cea0f9ae271fd224c3a /mysql-test | |
| parent | 7bfb3446a0ef838c06fb53566d543000c0b62d0e (diff) | |
| download | mariadb-git-e689fbc4582de1b5f81cb69d98f5fe54b7064db1.tar.gz | |
Fixed compiler warnings by adding casts and changing variable types
Fixed bug that caused change_user.test to fail
Fixed bug that caused mysql_client_test to fail
include/myisam.h:
Fixed prototypes
mysql-test/r/create.result:
Fix that test works even if Maria is not used for temporary tables
mysql-test/t/create.test:
Fix that test works even if Maria is not used for temporary tables
sql/mysqld.cc:
Fixed that default value of max_join_size is set correctly; It needs to match usage in set_var.cc
sql/set_var.cc:
Fixed test, now when max_join_size is initialized correctly
sql/sql_select.cc:
Fixed that one can compile without -DUSE_MARIA_FOR_TMP_TABLES
storage/maria/ma_blockrec.c:
Fixed compiler warnings by adding casts
storage/maria/ma_checkpoint.c:
Fixed compiler warnings by adding casts
storage/maria/ma_create.c:
Fixed compiler warnings by adding casts
storage/maria/ma_delete_table.c:
Fixed compiler warnings by adding casts
storage/maria/ma_loghandler.c:
Fixed compiler warnings by adding casts and changing types for variables
Changed translog_new_page_header to use changing integer instead of calling time() as time() is a slow call and will give same results when calling many times withing one second
storage/maria/ma_pagecrc.c:
Fixed compiler warnings by adding casts
storage/maria/ma_recovery.c:
Fixed indentation
storage/myisam/ha_myisam.cc:
Fixed wrong types for variables
Changed chk_data_link() and repair*() functions to take my_bool as argument
storage/myisam/mi_check.c:
Fixes to handle that param.test_flag is now ulonglong
storage/myisam/myisamchk.c:
Fixes to handle that param.test_flag is now ulonglong
support-files/compiler_warnings.supp:
Fixed line numbers
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/create.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/create.test | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result index 3fbec9e4a1d..2a5b2e92bb2 100644 --- a/mysql-test/r/create.result +++ b/mysql-test/r/create.result @@ -1717,7 +1717,7 @@ t1 CREATE TABLE `t1` ( `TIME` bigint(7) NOT NULL DEFAULT '0', `STATE` varchar(64) DEFAULT NULL, `INFO` longtext -) ENGINE=MARIA DEFAULT CHARSET=utf8 PAGE_CHECKSUM=1 +) ENGINE=MARIA DEFAULT CHARSET=utf8 drop table t1; create temporary table t1 like information_schema.processlist; show create table t1; @@ -1731,7 +1731,7 @@ t1 CREATE TEMPORARY TABLE `t1` ( `TIME` bigint(7) NOT NULL DEFAULT '0', `STATE` varchar(64) DEFAULT NULL, `INFO` longtext -) ENGINE=MARIA DEFAULT CHARSET=utf8 +) DEFAULT CHARSET=utf8 drop table t1; create table t1 like information_schema.character_sets; show create table t1; diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test index dff6bf3fcff..60540e0066a 100644 --- a/mysql-test/t/create.test +++ b/mysql-test/t/create.test @@ -1332,9 +1332,11 @@ drop function f1; # Bug#25629 CREATE TABLE LIKE does not work with INFORMATION_SCHEMA # create table t1 like information_schema.processlist; +--replace_result ENGINE=MyISAM "" ENGINE=Maria "" " PAGE_CHECKSUM=1" "" show create table t1; drop table t1; create temporary table t1 like information_schema.processlist; +--replace_result ENGINE=MyISAM "" ENGINE=MARIA "" " PAGE_CHECKSUM=1" "" show create table t1; drop table t1; create table t1 like information_schema.character_sets; |