database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0

Browse Source 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
sql/ha_archive.cc:
  SCCS merged
This commit is contained in:
unknown
2005-12-14 01:38:10 +02:00
parent 73b9175ce2 4e1d88af8f
commit b141917a0a
5 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/select.result
View File

@ -3337,3 +3337,11 @@ id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE t2 const PRIMARY PRIMARY 4 const 1 Using index 1 SIMPLE t2 const PRIMARY PRIMARY 4 const 1 Using index
1 SIMPLE t3 const PRIMARY PRIMARY 8 const,const 1 1 SIMPLE t3 const PRIMARY PRIMARY 8 const,const 1
DROP TABLE t1,t2,t3; DROP TABLE t1,t2,t3;
create table t1(f1 char, f2 char not null);
insert into t1 values(null,'a');
create table t2 (f2 char not null);
insert into t2 values('b');
select * from t1 left join t2 on f1=t2.f2 where t1.f2='a';
f1 f2 f2
NULL a NULL
drop table t1,t2;

10
mysql-test/t/select.test
View File

@ -2805,3 +2805,13 @@ EXPLAIN SELECT t2.key_a,foo
WHERE t2.key_a=2 and key_b=5; WHERE t2.key_a=2 and key_b=5;
DROP TABLE t1,t2,t3; DROP TABLE t1,t2,t3;
#
# Bug#15268 Unchecked null value caused server crash
#
create table t1(f1 char, f2 char not null);
insert into t1 values(null,'a');
create table t2 (f2 char not null);
insert into t2 values('b');
select * from t1 left join t2 on f1=t2.f2 where t1.f2='a';
drop table t1,t2;

1
sql/ha_archive.cc
View File

@ -20,6 +20,7 @@
#include "mysql_priv.h" #include "mysql_priv.h"
#if defined(HAVE_ARCHIVE_DB) && !defined(__NETWARE__)
#include "ha_archive.h" #include "ha_archive.h"
#include <my_dir.h> #include <my_dir.h>

6
sql/item_cmpfunc.h
View File

@ -723,9 +723,9 @@ public:
{ {
char buff[STRING_BUFFER_USUAL_SIZE]; char buff[STRING_BUFFER_USUAL_SIZE];
String tmp(buff, sizeof(buff), cmp_charset), *res; String tmp(buff, sizeof(buff), cmp_charset), *res;
if (!(res= arg->val_str(&tmp))) res= arg->val_str(&tmp);
return 1; /* Can't be right */ return (value_res ? (res ? sortcmp(value_res, res, cmp_charset) : 1) :
return sortcmp(value_res, res, cmp_charset); (res ? -1 : 0));
} }
int compare(cmp_item *c) int compare(cmp_item *c)
{ {

2
sql/sql_string.h
View File

@ -24,7 +24,7 @@
#define NOT_FIXED_DEC 31 #define NOT_FIXED_DEC 31
#endif #endif
#define STRING_WITH_LEN(X) ((char*) X), (sizeof(X)-1) #define STRING_WITH_LEN(X) ((const char*) X), ((uint) (sizeof(X) - 1))
class String; class String;
int sortcmp(const String *a,const String *b, CHARSET_INFO *cs); int sortcmp(const String *a,const String *b, CHARSET_INFO *cs);