Commit graph

5604 commits

Author SHA1 Message Date
kent@mysql.com
0b057dd6ee Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-29 12:46:13 +01:00
joreland@mysql.com
08b302894c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-29 07:04:04 +01:00
jimw@mysql.com
691cd6c50d Fix error in string comparisons with CHAR(31) against the space-padding
of strings of unequal length. (Bug #8134)
2005-01-28 17:18:35 -08:00
jimw@mysql.com
f95f820727 Fix test results for mysqldump test. Part of Bug #8148. 2005-01-28 12:13:01 -08:00
gluh@gluh.mysql.r18.ru
526dbfda22 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-28 19:37:04 +03:00
dlenev@mysql.com
10a9434ccd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-28 19:09:28 +03:00
dlenev@mysql.com
09b08edcc5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
2005-01-28 17:43:59 +03:00
dlenev@mysql.com
2276bfa374 Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and
CONVERT_TZ() function does not work well together" and bug #7705 
"CONVERT_TZ() crashes with subquery/WHERE on index column" in 5.0
tree.
2005-01-28 10:22:50 +03:00
joreland@mysql.com
7200ff359f Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-28 07:55:42 +01:00
dlenev@mysql.com
c80c503a1b Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
2005-01-28 09:32:43 +03:00
kent@mysql.com
499a441683 compile-solaris-sparc-purify:
Added preparation of mysql_client_test(_embedded) and mysqltest(_embedded)
  Added --purify, --purecov, --quantify and --cxxfilt <cxxfiltprog> options
mysql-test-run.sh:
  Report correctly combinations of embedded+ps-protocol etc
  Added initial Purify support
2005-01-28 00:35:26 +01:00
pekka@mysql.com
8480b22122 Merge 2005-01-27 18:41:23 +01:00
pekka@mysql.com
521f736737 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/export/space/pekka/ndb/version/my41
2005-01-27 18:12:04 +01:00
gluh@gluh.mysql.r18.ru
6afbb3d627 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-27 20:01:37 +03:00
pekka@mysql.com
5cbadf4358 ndb - make YEAR and TIMESTAMP into ndb types 2005-01-27 17:33:35 +01:00
gluh@gluh.mysql.r18.ru
9cb334f490 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
2005-01-27 18:23:05 +03:00
ingo@mysql.com
48488e483a Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-27 12:18:02 +01:00
ingo@mysql.com
896d3a5f05 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 12:10:15 +01:00
ram@gw.mysql.r18.ru
7fda26d7fb Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-27 14:16:54 +04:00
gluh@gluh.mysql.r18.ru
ac14d40dde A fix: information_schema test fails on Mac OSX 2005-01-27 13:16:51 +03:00
joreland@mysql.com
5d967c6603 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-27 10:31:45 +01:00
joreland@mysql.com
d470738ca0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-27 10:30:52 +01:00
gluh@gluh.mysql.r18.ru
efeeb3c2e6 Fix after review for
ChangeSet
  1.1803 05/01/24
  Additional fix for WL#1629: SHOW with WHERE(discussed with PeterG)
2005-01-27 11:06:44 +03:00
ingo@mysql.com
160541b5d4 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-27 08:32:46 +01:00
ingo@mysql.com
c83060628d Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 08:32:38 +01:00
ingo@mysql.com
1b02e18820 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-26 21:09:16 +01:00
patg@patrick-galbraiths-computer.local
9103a44908 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-26 11:53:33 -08:00
dlenev@brandersnatch.localdomain
80282016c2 Fix for bug #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ() function
does not work well together". Now using simplier and more correct
implementation of st_lex::unlink_first_table()/link_first_table_back() 
(It also nicely handles case when global table list is created because
of implictly used time zone tables). (2nd attempt)

Fix for bug #7705 "CONVERT_TZ() crashes with subquery/WHERE on index
column". Implemented new approach for caching objects for constant
time zone arguments. Now instead of determining whenever these arguments
are constants and performing time zone lookup at fix_fields() stage, we
do it on first get_date() invocation.

Cleanup of global @@time_zone variable handling.
2005-01-26 22:25:02 +03:00
igor@rurik.mysql.com
90fe2656c6 Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
2005-01-26 10:42:46 -08:00
gluh@gluh.mysql.r18.ru
a6315a8ad9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
2005-01-26 20:58:47 +03:00
dlenev@mysql.com
d8f0b7bec6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
2005-01-26 18:36:18 +03:00
ingo@mysql.com
bbcd542917 Merge from 4.1
Archive fix by Ingo.
Innodb compile fix by Monty.
2005-01-26 15:51:46 +01:00
ingo@mysql.com
be5dade853 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-26 15:31:31 +01:00
ingo@mysql.com
300337cee7 Merge mysql.com:/home/mydev/mysql-4.1
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-26 15:31:06 +01:00
ingo@mysql.com
5ad151aa21 Test Bug: Memory leaks in the archive handler.
Moved initialization code into a new init function.
Added a new cleanup function.
Added a call to close the meta file.
2005-01-26 15:27:31 +01:00
joreland@mysql.com
dde469a91e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-01-26 15:19:13 +01:00
mleich@mysql.com
f972a08695 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src
2005-01-26 15:13:31 +01:00
tomas@poseidon.ndb.mysql.com
259aa7131c updated show table status usage in ndb tests to become independent on ndb cluster run 2005-01-26 15:07:39 +01:00
dlenev@mysql.com
e85f70ba72 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
2005-01-26 16:40:50 +03:00
mleich@mysql.com
0e442f7c45 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src
2005-01-26 14:40:49 +01:00
tomas@poseidon.ndb.mysql.com
a87e0069ab added check in ndb tests that require "default" cluster running
i.e. ndb_restore
2005-01-26 14:38:13 +01:00
bell@sanja.is.com.ua
0bf6e3aefc fixed cleanup of result object of subqueries. (BUG#8125) 2005-01-26 15:27:45 +02:00
ram@gw.mysql.r18.ru
0c4e1e716e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-26 16:54:22 +04:00
mleich@mysql.com
0191a35ab5 Merge mysql.com:/home/matthias/Arbeit/mysql-5.0/src
into mysql.com:/home/matthias/Arbeit/mysql-5.0/src-WL1420
2005-01-26 13:24:00 +01:00
tomas@poseidon.ndb.mysql.com
f9d0512fc3 Merge 2005-01-26 13:22:07 +01:00
tomas@poseidon.ndb.mysql.com
5779a6a576 Bug#8101 unique indexes which attribute are _not_ specified in the order of the table does not work 2005-01-26 11:31:46 +01:00
joreland@mysql.com
f63c1120d0 ndb - make sure all used tables are dropped in beginning of test case 2005-01-26 11:23:43 +01:00
joreland@mysql.com
bff8064653 ndb - make sure all used tables are dropped in beginning of test case 2005-01-26 10:32:56 +01:00
mleich@mysql.com
60b64b7077 WL#1420 convert NIST test for mysql
Test cases using common object (database,user,table,..) names could probably
  destroy customer data, when connecting to an already running server.
  
  This Changeset contains an auxiliary routine  include/testdb_only.inc" which
  should be sourced by tests doing such dangerous things. 
  The test case will get a "[skipped]" when the environment variable 
  USE_RUNNING_SERVER is not 0 .
  The modified mysql-test-run.sh sets USE_RUNNING_SERVER to 0, when 
  the "mysql-test-run" starts its own server, aka there was no "--extern"
  option.
2005-01-26 10:19:28 +01:00
dlenev@mysql.com
560f2bd4d6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
2005-01-26 11:23:14 +03:00