Below is the list of changes that have just been committed into a local
5.0 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1941 05/05/07 05:05:30 jimw@stripped +11 -0
Merge
sql/sql_select.cc
1.327 05/05/07 05:05:22 jimw@stripped +3 -7
Merge from 4.1
sql/item.cc
1.119 05/05/07 05:02:39 jimw@stripped +1 -2
Merge from 4.1
mysql-test/t/temp_table.test
1.10 05/05/07 05:01:21 jimw@stripped +0 -1
Merge new tests
mysql-test/r/temp_table.result
1.14 05/05/07 05:00:58 jimw@stripped +0 -0
SCCS merged
mysql-test/r/create.result
1.87 05/05/07 05:00:37 jimw@stripped +0 -1
Merge changes
sql/ha_heap.cc
1.64 05/05/07 04:59:49 jimw@stripped +0 -0
Auto merged
mysql-test/t/innodb.test
1.87 05/05/07 04:59:49 jimw@stripped +9 -9
Auto merged
mysql-test/r/type_float.result
1.37 05/05/07 04:59:49 jimw@stripped +0 -0
Auto merged
mysql-test/r/innodb.result
1.110 05/05/07 04:59:49 jimw@stripped +6 -6
Auto merged
client/mysql.cc
1.165 05/05/07 04:59:49 jimw@stripped +0 -0
Auto merged
BUILD/FINISH.sh
1.28 05/05/07 04:59:49 jimw@stripped +0 -0
Auto merged
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jimw
# Host: rama.(none)
# Root: /home/jimw/my/mysql-5.0-clean/RESYNC
--- 1.164/client/mysql.cc 2005-05-06 06:21:29 -07:00
+++ 1.165/client/mysql.cc 2005-05-07 04:59:49 -07:00
@@ -962,7 +962,8 @@
}
else
{
- char *prompt= (char*) (glob_buffer.is_empty() ? construct_prompt() :
+ char *prompt= (char*) (ml_comment ? " /*> " :
+ glob_buffer.is_empty() ? construct_prompt() :
!in_string ? " -> " :
in_string == '\'' ?
" '> " : (in_string == '`' ?
--- 1.63/sql/ha_heap.cc 2005-04-27 02:25:03 -07:00
+++ 1.64/sql/ha_heap.cc 2005-05-07 04:59:49 -07:00
@@ -424,7 +424,8 @@
int ha_heap::delete_table(const char *name)
{
char buff[FN_REFLEN];
- int error= heap_delete_table(fn_format(buff,name,"","",4+2));
+ int error= heap_delete_table(fn_format(buff,name,"","",
+ MY_REPLACE_EXT|MY_UNPACK_FILENAME));
return error == ENOENT ? 0 : error;
}
@@ -555,7 +556,8 @@
hp_create_info.max_table_size=current_thd->variables.max_heap_table_size;
hp_create_info.with_auto_increment= found_real_auto_increment;
max_rows = (ha_rows) (hp_create_info.max_table_size / mem_per_row);
- error= heap_create(fn_format(buff,name,"","",4+2),
+ error= heap_create(fn_format(buff,name,"","",
+ MY_REPLACE_EXT|MY_UNPACK_FILENAME),
keys, keydef, share->reclength,
(ulong) ((share->max_rows < max_rows &&
share->max_rows) ?
--- 1.118/sql/item.cc 2005-05-06 03:46:01 -07:00
+++ 1.119/sql/item.cc 2005-05-07 05:02:39 -07:00
@@ -1035,7 +1035,7 @@
field=result_field=field_par; // for easy coding with fields
maybe_null=field->maybe_null();
decimals= field->decimals();
- max_length= field_par->field_length;
+ max_length= field_par->max_length();
table_name= *field_par->table_name;
field_name= field_par->field_name;
db_name= field_par->table->s->db;
--- 1.326/sql/sql_select.cc 2005-05-06 03:46:06 -07:00
+++ 1.327/sql/sql_select.cc 2005-05-07 05:05:22 -07:00
@@ -7955,20 +7955,20 @@
temp_pool_slot = bitmap_set_next(&temp_pool);
if (temp_pool_slot != MY_BIT_NONE) // we got a slot
- sprintf(filename, "%s_%lx_%i", tmp_file_prefix,
- current_pid, temp_pool_slot);
+ sprintf(path, "%s_%lx_%i", tmp_file_prefix,
+ current_pid, temp_pool_slot);
else
{
/* if we run out of slots or we are not using tempool */
- sprintf(filename,"%s%lx_%lx_%x",tmp_file_prefix,current_pid,
+ sprintf(path,"%s%lx_%lx_%x", tmp_file_prefix,current_pid,
thd->thread_id, thd->tmp_table++);
}
/*
- No need for change table name to lower case as we are only creating
+ No need to change table name to lower case as we are only creating
MyISAM or HEAP tables here
*/
- sprintf(path, "%s%s", mysql_tmpdir, filename);
+ fn_format(path, path, mysql_tmpdir, "", MY_REPLACE_EXT|MY_UNPACK_FILENAME);
if (group)
{
--- 1.86/mysql-test/r/create.result 2005-05-05 13:01:34 -07:00
+++ 1.87/mysql-test/r/create.result 2005-05-07 05:00:37 -07:00
@@ -448,11 +448,11 @@
t2 CREATE TABLE `t2` (
`ifnull(a,a)` tinyint(4) default NULL,
`ifnull(b,b)` smallint(6) default NULL,
- `ifnull(c,c)` mediumint(9) default NULL,
+ `ifnull(c,c)` mediumint(8) default NULL,
`ifnull(d,d)` int(11) default NULL,
`ifnull(e,e)` bigint(20) default NULL,
- `ifnull(f,f)` float(3,2) default NULL,
- `ifnull(g,g)` double(4,3) default NULL,
+ `ifnull(f,f)` float(24,2) default NULL,
+ `ifnull(g,g)` double(53,3) default NULL,
`ifnull(h,h)` decimal(5,4) default NULL,
`ifnull(i,i)` year(4) default NULL,
`ifnull(j,j)` date default NULL,
--- 1.109/mysql-test/r/innodb.result 2005-04-26 07:46:46 -07:00
+++ 1.110/mysql-test/r/innodb.result 2005-05-07 04:59:49 -07:00
@@ -2391,3 +2391,9 @@
set storage_engine=MyISAM;
create table t1 (v varchar(16384)) engine=innodb;
drop table t1;
+create table t1(a int(1) , b int(1)) engine=innodb;
+insert into t1 values ('1111', '3333');
+select distinct concat(a, b) from t1;
+concat(a, b)
+11113333
+drop table t1;
--- 1.13/mysql-test/r/temp_table.result 2005-04-24 17:00:30 -07:00
+++ 1.14/mysql-test/r/temp_table.result 2005-05-07 05:00:58 -07:00
@@ -123,3 +123,12 @@
A
This is view again
drop view t1;
+create table t1 (a int, b int, index(a), index(b));
+create table t2 (c int auto_increment, d varchar(255), primary key (c));
+insert into t1 values (3,1),(3,2);
+insert into t2 values (NULL, 'foo'), (NULL, 'bar');
+select d, c from t1 left join t2 on b = c where a = 3 order by d;
+d c
+bar 2
+foo 1
+drop table t1, t2;
--- 1.36/mysql-test/r/type_float.result 2005-04-01 19:02:07 -08:00
+++ 1.37/mysql-test/r/type_float.result 2005-05-07 04:59:49 -07:00
@@ -92,7 +92,7 @@
Table Create Table
t2 CREATE TABLE `t2` (
`col1` double default NULL,
- `col2` double(22,5) default NULL,
+ `col2` double(53,5) default NULL,
`col3` double default NULL,
`col4` double default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
--- 1.86/mysql-test/t/innodb.test 2005-04-16 08:57:14 -07:00
+++ 1.87/mysql-test/t/innodb.test 2005-05-07 04:59:49 -07:00
@@ -1300,3 +1300,12 @@
# InnoDB specific varchar tests
create table t1 (v varchar(16384)) engine=innodb;
drop table t1;
+
+#
+# Bug #4082: integer truncation
+#
+
+create table t1(a int(1) , b int(1)) engine=innodb;
+insert into t1 values ('1111', '3333');
+select distinct concat(a, b) from t1;
+drop table t1;
--- 1.9/mysql-test/t/temp_table.test 2005-03-01 19:03:29 -08:00
+++ 1.10/mysql-test/t/temp_table.test 2005-05-07 05:01:21 -07:00
@@ -90,6 +90,20 @@
show status like "created_tmp%tables";
drop table t1;
+# Fix for BUG#8921: Check that temporary table is ingored by view commands.
+create temporary table t1 as select 'This is temp. table' A;
+create view t1 as select 'This is view' A;
+select * from t1;
+show create table t1;
+show create view t1;
+drop view t1;
+select * from t1;
+create view t1 as select 'This is view again' A;
+select * from t1;
+drop table t1;
+select * from t1;
+drop view t1;
+
# Bug #8497: tmpdir with extra slashes would cause failures
#
create table t1 (a int, b int, index(a), index(b));
--- 1.27/BUILD/FINISH.sh 2004-11-23 06:10:07 -08:00
+++ 1.28/BUILD/FINISH.sh 2005-05-07 04:59:49 -07:00
@@ -2,12 +2,6 @@
cxxflags="$cxx_warnings $base_cxxflags $extra_flags"
extra_configs="$extra_configs $local_infile_configs"
configure="./configure $base_configs $extra_configs"
-for arg
-do
- # Escape special characters so they don't confuse eval
- configure="$configure "`echo "$arg" | \
- sed -e 's,\([^a-zA-Z0-9_.=-]\),\\\\\1,g'`
-done
commands="\
$make -k distclean || true
| Thread |
|---|
| • bk commit into 5.0 tree (jimw:1.1941) | Jim Winstead | 7 May |
