Commit 60b7f9d6 authored by unknown's avatar unknown
Browse files

Merge bodhi.local:/opt/local/work/tmp_merge 

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


BitKeeper/etc/ignore:
  auto-union
libmysqld/Makefile.am:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
sql/set_var.cc:
  Manual merge.
sql/set_var.h:
  Manual merge.
sql/sql_cache.cc:
  Manual merge.
sql/sql_class.cc:
  Manual merge.
parents e9775dd8 854d7c4d

.bzrignore

+10 −9
Original line number Diff line number Diff line 
*.Plo

*.Po

*.a

*.bb

*.bbg
@@ -9,6 +11,7 @@ 
*.gcov

*.idb

*.la

*.lai

*.lib

*.lo

*.map
@@ -26,9 +29,6 @@ 
*/.pure

*~

.*.swp

*.Po

*.Plo

*.lai

./README.build-files

./config.h

./copy_mysql_files.bat
@@ -45,9 +45,6 @@ 
.gdb_history

.gdbinit

.libs

client/.libs -prune

tests/.libs -prune

tools/.libs -prune

.o

.out

.snprj/*
@@ -55,6 +52,7 @@ tools/.libs -prune 
50

=6

BUILD/compile-pentium-maintainer

BitKeeper/etc/RESYNC_TREE

BitKeeper/etc/config

BitKeeper/etc/csets

BitKeeper/etc/csets-in
@@ -286,6 +284,7 @@ build_tags.sh 
client/#mysql.cc#

client/*.ds?

client/*.vcproj

client/.libs -prune

client/completion_hash.cpp

client/decimal.c

client/insert_test
@@ -565,6 +564,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
@@ -676,6 +676,7 @@ mysql-test/mysql-test-run.log 
mysql-test/mysql_test_run_new

mysql-test/ndb/ndbcluster

mysql-test/r/*.err

mysql-test/r/*.log

mysql-test/r/*.out

mysql-test/r/*.reject

mysql-test/r/alter_table.err
@@ -1068,6 +1069,7 @@ scripts/mysql_secure_installation 
scripts/mysql_setpermission

scripts/mysql_tableinfo

scripts/mysql_upgrade

scripts/mysql_upgrade_shell

scripts/mysql_zap

scripts/mysqlaccess

scripts/mysqlbug
@@ -1269,6 +1271,7 @@ test1/* 
test_xml

tests/*.ds?

tests/*.vcproj

tests/.libs -prune

tests/client_test

tests/connect_test

tests/mysql_client_test
@@ -1276,6 +1279,7 @@ thr_insert_test/* 
thr_test/*

thread_test

tmp/*

tools/.libs -prune

tools/my_vsnprintf.c

tools/mysqlmanager

tools/mysqlmngd
@@ -1292,6 +1296,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
BitKeeper/etc/RESYNC_TREE

mysql-test/r/*.log

scripts/mysql_upgrade_shell

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,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 \

myisam/mi_create.c

+29 −7
Original line number Diff line number Diff line
@@ -545,8 +545,19 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 


  if (ci->index_file_name)

  {

    fn_format(filename, ci->index_file_name,"",MI_NAME_IEXT,4);

    fn_format(linkname,name, "",MI_NAME_IEXT,4);

    if (options & HA_OPTION_TMP_TABLE)

    {

      char *path;

      /* chop off the table name, tempory tables use generated name */

      if ((path= strrchr(ci->index_file_name, FN_LIBCHAR)))

        *path= '\0';

      fn_format(filename, name, ci->index_file_name, MI_NAME_IEXT,

                MY_REPLACE_DIR | MY_UNPACK_FILENAME);

    }

    else

      fn_format(filename, ci->index_file_name, "",

                MI_NAME_IEXT, MY_UNPACK_FILENAME);

    fn_format(linkname, name, "", MI_NAME_IEXT, MY_UNPACK_FILENAME);

    linkname_ptr= linkname;

    /*

      Don't create the table if the link or file exists to ensure that one
@@ -601,8 +612,19 @@ int mi_create(const char *name,uint keys,MI_KEYDEF *keydefs, 
    {

      if (ci->data_file_name)

      {

	fn_format(filename, ci->data_file_name,"",MI_NAME_DEXT,4);

	fn_format(linkname, name, "",MI_NAME_DEXT,4);

        if (options & HA_OPTION_TMP_TABLE)

        {

          char *path;

          /* chop off the table name, tempory tables use generated name */

          if ((path= strrchr(ci->data_file_name, FN_LIBCHAR)))

            *path= '\0';

          fn_format(filename, name, ci->data_file_name, MI_NAME_DEXT,

                    MY_REPLACE_DIR | MY_UNPACK_FILENAME);

        }

        else

          fn_format(filename, ci->data_file_name, "",

                    MI_NAME_DEXT, MY_UNPACK_FILENAME);

        fn_format(linkname, name, "", MI_NAME_DEXT, MY_UNPACK_FILENAME);

        linkname_ptr= linkname;

        create_flag= 0;

      }

mysql-test/r/date_formats.result

+16 −0
Original line number Diff line number Diff line
@@ -495,6 +495,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");

mysql-test/r/myisam.result

+21 −0
Original line number Diff line number Diff line
@@ -1454,3 +1454,24 @@ create table t3 (c1 int) engine=myisam pack_keys=default; 
create table t4 (c1 int) engine=myisam pack_keys=2;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '2' at line 1

drop table t1, t2, t3;

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

create table t1 (a int) engine=myisam select 42 a;

select * from t1;

a

9

select * from t1;

a

99

select * from t1;

a

42

drop table t1;