Commit graph

29096 commits

Author SHA1 Message Date
unknown
479a02fad5 Bug#12770 DESC cannot display the info. about temporary table
Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
Bug#15224 SHOW INDEX from temporary table doesn't work.
  Restore thd->temporary_tables to be able to process
  temporary tables(only for 'show index' & 'show columns').
  This should be changed when processing of temporary tables for
  I_S tables will be done.


mysql-test/r/information_schema.result:
  Bug#12770 DESC cannot display the info. about temporary table
  Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
  Bug#15224 SHOW INDEX from temporary table doesn't work.
    test case
mysql-test/t/information_schema.test:
  Bug#12770 DESC cannot display the info. about temporary table
  Bug#14387 SHOW COLUMNS doesn't work on temporary tables.
  Bug#15224 SHOW INDEX from temporary table doesn't work.
    test case
2005-12-19 14:46:54 +04:00
unknown
32279956f6 mysql-test/t/federated_transactions.test
Fix a typo: Trailing ";" for "source" command.


mysql-test/t/federated_transactions.test:
  Fix a typo: Trailing ";" for "source" command.
2005-12-19 11:12:53 +01:00
unknown
5da2f8439e Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2005-12-19 19:06:12 +11:00
unknown
adc0c223b4 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/cleanup


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
2005-12-19 19:01:20 +11:00
unknown
bdca072855 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main
into  mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup


ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
2005-12-19 19:00:17 +11:00
unknown
e57903f51d Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/hartmut/projects/mysql/dev/5.1


extra/Makefile.am:
  Auto merged
2005-12-19 08:33:27 +01:00
unknown
a466e28000 federated_transactions.test:
Test require Berkeley DB


mysql-test/t/federated_transactions.test:
  Test require Berkeley DB
2005-12-19 04:05:48 +01:00
unknown
b39c4c77cf Merge 2005-12-19 03:49:02 +01:00
unknown
2162019056 mysql-test-run.pl:
Script "my_print_defaults" is to be searched for as executable


mysql-test/mysql-test-run.pl:
  Script "my_print_defaults" is to be searched for as executable
2005-12-19 03:39:25 +01:00
unknown
f6160c7de6 disabled.def:
Disabled 'type_time' until 15805 is closed


mysql-test/t/disabled.def:
  Disabled 'type_time' until 15805 is closed
2005-12-19 03:05:26 +01:00
unknown
2a5aa3f251 mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln:
Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
  new file


VC++Files/mysql.sln:
  Added "client/mysqlslap"
netware/Makefile.am:
  Added "client/mysqlslap"
scripts/make_binary_distribution.sh:
  Added "client/mysqlslap"
support-files/mysql.spec.sh:
  Added "client/mysqlslap"
2005-12-19 01:12:11 +01:00
unknown
1a2bc657ef Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2005-12-18 16:12:18 -06:00
unknown
d0cf13f8c1 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-12-18 18:27:34 +01:00
unknown
a5ecdebac3 Merge
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_multi.result:
  Auto merged
mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/r/type_time.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_multi.test:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
storage/ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
zlib/Makefile.am:
  Auto merged
2005-12-18 18:11:19 +01:00
unknown
2de5c14162 Merge
mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/r/ndb_multi.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
mysql-test/t/ndb_multi.test:
  Auto merged
sql/sql_class.cc:
  Auto merged
2005-12-18 15:26:37 +01:00
unknown
a3a5df43a5 Makefile.am:
Added 5.0 specific build scripts


BUILD/Makefile.am:
  Added 5.0 specific build scripts
2005-12-18 15:07:58 +01:00
unknown
de1c06b9a2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


BUILD/Makefile.am:
  Auto merged
2005-12-18 15:02:13 +01:00
unknown
aa6d8551f8 Merge 2005-12-18 14:55:05 +01:00
unknown
e97a4a4a17 Makefile.am:
Adjusted listing of files to put into source TAR
2005-12-18 14:51:19 +01:00
unknown
25f396adc2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2005-12-18 13:31:43 +01:00
unknown
3cd1e9765c BUG#11336 - fulltext index corruption after repair_by_sort and mi_delete
for uca collation isalnum and strnncollsp don't agree on whether
0xC2A0 is a space (strnncollsp is right, isalnum is wrong).

they still don't, the bug was fixed by avoiding strnncollsp
2005-12-18 13:30:01 +01:00
unknown
152e0edc39 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-12-17 04:22:16 +01:00
unknown
6642eb0581 Merge mysql.com:/home/jimw/my/mysql-5.1-14809
into  mysql.com:/home/jimw/my/mysql-5.1-clean


sql/ha_berkeley.cc:
  Auto merged
2005-12-16 14:31:27 -08:00
unknown
7c49bdc10e Fixed default values for counters to 0 2005-12-16 22:53:10 +02:00
unknown
9f444445bc Merge alstroganov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  regul.home.lan:/mnt/md/bk/mysql-5.0
2005-12-16 22:15:53 +02:00
unknown
8cafa3f37f Merge paul@bk-internal.mysql.com:/home/bk/mysql-5.0
into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0
2005-12-16 10:44:50 -06:00
unknown
c181806154 Merge mysql.com:/M51/try-5.1-extra into mysql.com:/M51/mysql-5.1 2005-12-16 12:47:14 +01:00
unknown
1aba662c7d storage/innobase/Makefile.am :
Restore "make dist" for the header files in "storage/innobase/include".


storage/innobase/Makefile.am:
  A recent change (coming from the "innobase" team, pushed by alexi) broke "make dist"
  which is needed for release builds (deletion of "storage/innobase/include/Makefile.am").
  The effect was that files "storage/innobase/include/*.h" were missing in the source.tgz
  
  Restore "make dist" without fully reverting the change by listing the files in a (new)
  "EXTRA_DIST" target in the parent level directory.
2005-12-16 12:45:43 +01:00
unknown
5c12976f53 BUG#15805: Disabled test type_time; fails in --ps-protocol mode.
mysql-test/t/disabled.def:
  Disabled test type_time; fails in --ps-protocol mode.
2005-12-16 09:38:30 +01:00
unknown
7c4ada147e Fixed stress parts in shell and perl versions of mysql-test-run script to limit stress testing
with 20 test loops in case when any limit parameter was specified



mysql-test/lib/mtr_stress.pl:
  Limit stress testing with 20 test loops in case when any limit parameter was specified
mysql-test/mysql-test-run.pl:
  Limit stress testing with 20 test loops in case when any limit parameter was specified
mysql-test/mysql-test-run.sh:
  Limit stress testing with 20 test loops in case when any limit parameter was specified
2005-12-16 00:23:55 +02:00
unknown
6f3f33b500 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.clean
2005-12-15 22:06:02 +04:00
unknown
49a22151cc Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.clean
2005-12-15 21:00:14 +04:00
unknown
9008814ef7 tests fixed as we implement informative error message
mysql-test/r/partition_list.result:
  test result fixed
mysql-test/r/partition_range.result:
  test result fixed
mysql-test/t/partition_list.test:
  test fixed
mysql-test/t/partition_range.test:
  test fixed
2005-12-15 20:56:14 +04:00
unknown
4db14a57e7 Merge mysql.com:/home/alexi/dev/mysql-4.1-12440
into  mysql.com:/home/alexi/dev/mysql-5.0-12440


mysql-test/r/type_time.result:
  Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
  Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
  Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  Auto merged
sql-common/my_time.c:
  Auto merged
zlib/Makefile.am:
  Auto merged
2005-12-15 18:59:40 +03:00
unknown
52c0440085 Fixed BUG #12440: "Incorrect processing of time values containing
long fraction and/or large exponent part".


mysql-test/r/type_time.result:
  Fixed testcases results (bug #12440)
mysql-test/t/type_time.test:
  Added testcases for bug #12440
sql-common/my_time.c:
  Fixed bug #12440: "Incorrect processing of time values containing
   long fraction and/or large exponent part".
   Modified str_to_time(). Process properly fraction part containing
   more than 6 digits. Check for existence of exponent part which
   may result from %g formatting applied to time value specified as
   large real number.
2005-12-15 18:48:08 +03:00
unknown
a848d91ea3 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-release
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new


mysql-test/r/ndb_basic.result:
  Auto merged
mysql-test/t/ndb_basic.test:
  Auto merged
sql/sql_class.cc:
  Auto merged
mysql-test/r/ndb_multi.result:
  merge
mysql-test/t/ndb_multi.test:
  merge
sql/ha_ndbcluster.cc:
  merge
2005-12-15 15:11:42 +01:00
unknown
4ede1ed354 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2005-12-15 15:07:20 +01:00
unknown
cb179dd38d Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
into trift-lap.fambruehe:/MySQL/M51/work-5.1


mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
2005-12-15 14:01:40 +01:00
unknown
36736898f3 Merge bk@192.168.21.1:mysql-5.1-new
into mysql.com:/home/hf/work/mysql-5.1.clean
2005-12-15 16:55:12 +04:00
unknown
a3cc718cc4 bug #15524 (partitioning range/list violation error message is insufficient)
include/my_base.h:
  HA_ERR_NO_PARTITION_FOUND added
mysql-test/r/partition_error.result:
  test result fixed
mysql-test/t/partition_error.test:
  test case added
sql/ha_partition.cc:
  now we launch the informative error message here
sql/share/errmsg.txt:
  Error message added
2005-12-15 16:20:56 +04:00
unknown
1b74cbd9d6 bug #15521 (Cannot reorganise a partition with a new name equal to the old name)
mysql-test/r/partition.result:
  result fixed
mysql-test/r/partition_mgm_err.result:
  result fixed
mysql-test/t/partition.test:
  test case added
mysql-test/t/partition_mgm_err.test:
  test modified to produce the declared error
sql/handler.h:
  check_reorganise_list interface
sql/sql_partition.cc:
  check_reorganise_list implementation
sql/sql_table.cc:
  now we call check_reorganise_list to do proper test.
  Also we should set right no_parts value as it can change here
2005-12-15 15:24:35 +04:00
unknown
ed1efa7c54 Merge joerg@trift2:/M50/part3-kent-joerg
into trift-lap.fambruehe:/MySQL/M51/merge-5.1


mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
2005-12-15 12:10:00 +01:00
unknown
36ceef6a7b Merge mysql.com:/usr/local/mysql/mysql-5.0-merge
into  mysql.com:/usr/local/mysql/mysql-5.1-new


mysql-test/r/skip_name_resolve.result:
  Auto merged
mysql-test/t/skip_name_resolve.test:
  Auto merged
2005-12-15 09:52:11 +01:00
unknown
6901d789d6 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-new
2005-12-15 09:34:07 +01:00
unknown
409fbaa6bd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2005-12-15 08:58:39 +01:00
unknown
bb23370389 Makefile.am:
- libtool wants spaces on parameters for its command line options


zlib/Makefile.am:
  - libtool wants spaces on parameters for its command line options
2005-12-15 02:13:29 -03:00
unknown
b6aaf4f6d1 Makefile.am:
- libtool wants spaces on parameters for its command line options


zlib/Makefile.am:
  - libtool wants spaces on parameters for its command line options
2005-12-15 02:11:21 -03:00
unknown
4e971ef7a6 Makefile.am:
- libtool wants spaces on parameters for its command line options


zlib/Makefile.am:
  - libtool wants spaces on parameters for its command line options
2005-12-15 02:08:52 -03:00
unknown
0b42809f51 Makefile.am:
- Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0


zlib/Makefile.am:
  - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0
2005-12-15 00:54:15 -03:00
unknown
5b7752442f Makefile.am:
- Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0


zlib/Makefile.am:
  - Modified zlib/Makefile.am to generate libz.so.1.2.3 instead of libz.so.0.0.0
2005-12-15 00:44:22 -03:00