Commit a13b3c49 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.1 

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge


mysql-test/r/create_not_windows.result:
  Auto merged
sql/sql_base.cc:
  Auto merged
parents 9c782e6b 8ed51c92

.bzrignore

+8 −0
Original line number Diff line number Diff line 
*-t

*.Plo

*.Po

*.a

*.bb

*.bbg
@@ -12,6 +14,7 @@ 
*.gcov

*.idb

*.la

*.lai

*.lib

*.lo

*.map
@@ -23,6 +26,7 @@ 
*.res

*.sbr

*.so

*.so.*

*.spec

*/*_pure_*warnings

*/.pure
@@ -283,6 +287,7 @@ build_tags.sh 
client/#mysql.cc#

client/*.ds?

client/*.vcproj

client/.libs -prune

client/completion_hash.cpp

client/decimal.c

client/insert_test
@@ -578,6 +583,7 @@ libmysqld/sql_insert.cc 
libmysqld/sql_lex.cc

libmysqld/sql_list.cc

libmysqld/sql_load.cc

libmysqld/sql_locale.cc

libmysqld/sql_manager.cc

libmysqld/sql_map.cc

libmysqld/sql_olap.cc
@@ -1755,6 +1761,7 @@ test1/* 
test_xml

tests/*.ds?

tests/*.vcproj

tests/.libs -prune

tests/client_test

tests/connect_test

tests/mysql_client_test
@@ -1762,6 +1769,7 @@ thr_insert_test/* 
thr_test/*

thread_test

tmp/*

tools/.libs -prune

tools/my_vsnprintf.c

tools/mysqlmanager

tools/mysqlmngd

libmysqld/CMakeLists.txt

+3 −2
Original line number Diff line number Diff line
@@ -61,8 +61,9 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc 
            ../sql/sql_update.cc ../sql/sql_view.cc 

            ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc

            ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc

            ../sql/partition_info.cc ../vio/vio.c

            ../vio/viosocket.c ../vio/viossl.c ../vio/viosslfactories.c

            ../sql/partition_info.cc ../sql/sql_locale.cc

            ../vio/vio.c ../vio/viosocket.c ../vio/viossl.c

            ../vio/viosslfactories.c

            ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc

            ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h)

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	key.cc lock.cc log.cc log_event.cc sql_state.c \

	protocol.cc net_serv.cc opt_range.cc \

	opt_sum.cc procedure.cc records.cc sql_acl.cc \

	sql_load.cc discover.cc \

	sql_load.cc discover.cc sql_locale.cc \

	sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \

	sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \

	sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc sql_parse.cc \

mysql-test/r/create_not_windows.result

+17 −0
Original line number Diff line number Diff line
@@ -12,3 +12,20 @@ about:text CREATE TABLE `about:text` ( 
  PRIMARY KEY (`_id`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1

drop table `about:text`;

use test;

drop table if exists t1;

create table t1(a int) engine=myisam;

insert into t1 values(1);

"We get an error because the table is in the definition cache"

create table t1(a int, b int);

ERROR 42S01: Table 't1' already exists

"Flush the cache and recreate the table anew to be able to drop it"

flush tables;

show open tables like "t%";

Database	Table	In_use	Name_locked

create table t1(a int, b int, c int);

"Try to select from the table. This should not crash the server"

select count(a) from t1;

count(a)

0

drop table t1;

mysql-test/r/date_formats.result

+16 −0
Original line number Diff line number Diff line
@@ -498,6 +498,22 @@ f1 f2 
Warnings:

Warning	1292	Truncated incorrect date value: '2003-04-05  g'

Warning	1292	Truncated incorrect datetime value: '2003-04-05 10:11:12.101010234567'

set names latin1;

select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');

date_format('2004-01-01','%W (%a), %e %M (%b) %Y')

Thursday (Thu), 1 January (Jan) 2004

set lc_time_names=ru_RU;

set names koi8r;

select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');

date_format('2004-01-01','%W (%a), %e %M (%b) %Y')

 (), 1  () 2004

set lc_time_names=de_DE;

set names latin1;

select date_format('2004-01-01','%W (%a), %e %M (%b) %Y');

date_format('2004-01-01','%W (%a), %e %M (%b) %Y')

Donnerstag (Do), 1 Januar (Jan) 2004

set names latin1;

set lc_time_names=en_US;

create table t1 (f1 datetime);

insert into t1 (f1) values ("2005-01-01");

insert into t1 (f1) values ("2005-02-01");