mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 21:42:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19764 commits 2784 branches 343 tags 1.6 GiB
Commit graph

5615 commits

Author SHA1 Message Date
wax@mysql.com
2251593a09 Merge mysql.com:/home/wax/mysql/mysql-4.1 
into mysql.com:/home/wax/mysql/mysql-4.1test2
 2005-01-31 19:23:19 +05:00
wax@kishkin.ru
6ba40427ba WL#964 
added client_test.dsp in project
    added CHARACTER SET in tables
    added 5th time zone
    included lstat in if()
    expanded ignore list for windows
    added directory slave1 and slave2
    added options for mysqld and mysqltest
    fixed error in read_option()
    fixed and added enviroment variables for Linux and Windows
    rewrote str_tok()
    added replacment 3th column
    New BitKeeper file ``VC++Files/tests/client_test.dsp''
 2005-01-31 19:18:06 +05:00
gluh@gluh.mysql.r18.ru
a899655e7a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-31 17:13:03 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
ba716c80f1 Bug#7011 
Fix tests after merge from 4.0
 2005-01-31 13:18:36 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
6a354b1b04 Bug#7011 
Merge from 4.0
 2005-01-31 12:48:00 +00:00
gluh@gluh.mysql.r18.ru
89ba364e03 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-31 13:36:05 +03:00
kent@mysql.com
89b3897005 Merge 2005-01-31 10:24:33 +01:00
acurtis@pcgem.rdg.cyberkinetica.com
500fbf5c0f Bug#7011 
Fix replication for multi-update
  new test - rpl_multi_update2
 2005-01-30 10:24:03 +00:00
kent@mysql.com
b0d2e3c9d9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-01-30 00:32:14 +01:00
dlenev@mysql.com
922f0b007c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-01-29 19:57:29 +03:00
kent@mysql.com
57fce07b31 mysql-test-run.sh: 
Old Solaris 'test' lack -e
 2005-01-29 15:59:29 +01:00
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
ingo@mysql.com
5ea224b824 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-26 09:09:53 +01:00
ingo@mysql.com
f003fb1f9c Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-4000
 2005-01-26 09:07:25 +01:00
igor@rurik.mysql.com
7d34849e6e order_by.result, order_by.test: 
Added test case for bug #7672 that existed only in 4.0.
 2005-01-25 23:13:36 -08:00
igor@rurik.mysql.com
34fa69a194 order_by.result, order_by.test: 
Added a test case for bug #7672.
sql_yacc.yy:
  Fixed bug #7672.
  Made queries of the form (SELECT ...) ORDER BY ... to
  be equivalent to SELECT ... ORDER BY ...
 2005-01-25 14:30:38 -08:00
jimw@mysql.com
ec98b8f235 Change 'mysql' client to output XML like the 'mysqldump' 
tool does, with the column names as attributes on <field>
elements, instead of trying to use the column name as the
element name. Also fix some encoding issues. (Bug #7811)
 2005-01-25 14:25:40 -08:00
patg@patrick-galbraiths-computer.local
e0cd200891 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
 2005-01-25 11:10:07 -08:00
ingo@mysql.com
704d84a12c Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-25 19:37:15 +01:00
jani@ua141d10.elisa.omakaista.fi
4341ffda0e Some minor fixes. 2005-01-25 20:08:16 +02:00
patg@patrick-galbraiths-computer.local
1bceba0995 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
 2005-01-25 09:35:57 -08:00
jani@ua141d10.elisa.omakaista.fi
d5f76d50f6 Some bug fixes and a feature add to mysql-test-run 2005-01-25 18:32:09 +02:00
ram@gw.mysql.r18.ru
3064b555a6 tT replaced with T1 to be more predictable. 2005-01-25 16:42:16 +04:00
ram@gw.mysql.r18.ru
bb1fe73356 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-25 13:39:19 +04:00
ingo@mysql.com
a5148a0df9 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-25 10:33:07 +01:00
ram@gw.mysql.r18.ru
3350a7ec6d Merge gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0
 2005-01-25 13:05:15 +04:00
tomas@poseidon.ndb.mysql.com
b74ddc6aaf Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-25 10:05:14 +01:00
tomas@poseidon.ndb.mysql.com
1baa14bbe1 backported ndb_mgm options from 5.0 
changed ndb_restore test somewhat to fisrt make the tables in myisam
 2005-01-25 10:03:27 +01:00
tomas@poseidon.ndb.mysql.com
98fbdecc7b Merge 2005-01-25 09:53:39 +01:00
ingo@mysql.com
bcd1c31a53 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-25 09:47:01 +01:00
gluh@gluh.mysql.r18.ru
849ef34156 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-25 11:42:50 +03:00
ingo@mysql.com
88c434a905 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-25 09:06:11 +01:00
ram@gw.mysql.r18.ru
8c043a299b 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-25 11:06:12 +04:00
ram@gw.mysql.r18.ru
35b521c925 Test case (bug #7261: Alter table loses temp table with lower_case_table_names=2). 2005-01-25 10:58:30 +04:00
tomas@poseidon.ndb.mysql.com
866182d35b Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-01-25 07:23:07 +01:00
jimw@mysql.com
d11081bd6f Merge 2005-01-24 13:48:48 -08:00
serg@serg.mylan
736530afc8 merged 2005-01-24 21:30:21 +01:00
patg@patrick-galbraiths-computer.local
d6727ff70f Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
 2005-01-24 11:31:21 -08:00
serg@serg.mylan
c33f1b6e63 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-24 19:45:15 +01:00
serg@serg.mylan
c76405a7ee merged 2005-01-24 19:41:42 +01:00
ingo@mysql.com
793d9bccfd Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-24 19:23:53 +01:00
tomas@poseidon.ndb.mysql.com
9ec1fda2cf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2005-01-24 19:15:44 +01:00
kent@mysql.com
67d246ac2f Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-01-24 16:57:57 +01:00
kent@mysql.com
777595bd61 mysql_client_test.test, mysql-test-run.sh: 
Let MYSQL_CLIENT_TEST be set with command line from mysql-test-run script
mysql-test-run.sh:
  Renamed client_test to mysql_client_test
  Support --embedded-server test on installed server
mysql_client_test.test:
  Renamed client_test to mysql_client_test
  Use env var CLIENT_TEST with full name, it differs when run with --embedded-server
  Rename: mysql-test/t/client_test.test -> mysql-test/t/mysql_client_test.test
 2005-01-24 16:56:17 +01:00
gluh@gluh.mysql.r18.ru
e492c1b44e Additional fix for WL#1629: SHOW with WHERE(discussed with PeterG) 
- Do not allow a column list as part of SHOW WITH WHERE task.
 - The WHERE clause must accept field names which are
   valid in SHOW, not INFORMATION_SCHEMA names.
 2005-01-24 18:44:54 +03:00
bell@sanja.is.com.ua
6d71acf01e fixed way of forward reference detection to support literal constant (BUG#8025) 2005-01-24 17:17:19 +02:00
serg@serg.mylan
79240013b2 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-24 15:50:13 +01:00
bell@sanja.is.com.ua
2371c992de check that row elements have the same dimention that SELECT list elements in comporison between rows and subqueries added (BUG#8022) 2005-01-24 15:56:57 +02:00
bell@sanja.is.com.ua
76ae5caca0 fixed column number fetchinmg for subqueries. (BUG#8020) 
fixed cols() method call (it have to be called only after fix_fields())
 2005-01-24 14:25:44 +02:00
tomas@poseidon.ndb.mysql.com
eba78e5ef6 ndb_restore.result, mysql-test-run.sh: 
added ndb_restore test
ndb_restore.result, ndb_restore.test:
  new file
 2005-01-24 13:06:27 +01:00
ingo@mysql.com
c4a0eb142b Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-24 10:48:52 +01:00
ingo@mysql.com
47c4009149 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-24 10:47:52 +01:00
tomas@poseidon.ndb.mysql.com
a551510cfd mysql-test-run.sh: 
backported access to ndb_mgm from 5.0
 2005-01-24 10:47:51 +01:00
ingo@mysql.com
5f23207d95 Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-4000
 2005-01-24 10:08:45 +01:00
bell@sanja.is.com.ua
5e36e83164 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-01-23 21:58:24 +02:00
igor@rurik.mysql.com
14eceb4b98 Manual merge 2005-01-22 03:12:44 -08:00
igor@rurik.mysql.com
0b61a16fd2 Merge rurik.mysql.com:/home/igor/dev/mysql-4.0-0 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-01-22 02:42:54 -08:00
igor@rurik.mysql.com
8527f256c0 select_found.result, select_found.test: 
Added a test case for bug #7945.
sql_select.cc:
  Fixed bug #7945. If DISTINCT is used only with constants
  in a query with GROUP BY, we can apply an optimization
  that set LIMIT to 1 only in the case when there is 
  no SQL_CALC_FOUND_ROWS.
 2005-01-22 02:40:27 -08:00
tomas@poseidon.ndb.mysql.com
bca11d8729 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-21 17:50:58 +01:00
ingo@mysql.com
c7563247d1 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-21 14:57:57 +01:00
bar@mysql.com
ecd8252e56 merge bug##7943: Wrong prefix lengths reported on UTF-8 columns 2005-01-21 16:55:17 +04:00
bell@sanja.is.com.ua
938acb3291 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2005-01-21 14:54:27 +02:00
bar@mysql.com
2f6e0864ad Bug#7943: Wrong prefix lengths reported on UTF-8 columns 
SHOW KEYS FROM t1 now displays number of characters in Sub_part,
not number of bytes, to be compatible with SHOW CREATE TABLE.
 2005-01-21 16:49:20 +04:00
tomas@poseidon.ndb.mysql.com
a5b0a5352a Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-21 12:18:24 +01:00
tomas@poseidon.ndb.mysql.com
0735fc89a4 enabled adding option to ndb_mgm in mysql test run 2005-01-21 12:15:14 +01:00
ingo@mysql.com
da091f2c22 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-21 12:14:16 +01:00
ingo@mysql.com
565c2fdb6c Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-21 09:53:31 +01:00
ram@gw.mysql.r18.ru
84f0b1eeee Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-21 12:10:19 +04:00
joreland@mysql.com
b3a6628599 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-21 08:41:39 +01:00
tomas@poseidon.ndb.mysql.com
72dc9ff915 moved START_AND_EXIT check so it can actually be used 
fix as not to overwrite previoulsy set flags in configure
 2005-01-21 08:41:38 +01:00
patg@pc248.lfp.kcls.org
1da60b9f45 -Added quote_data and needs_quotes (moved from federated handler. 
-New tests and results

logging_ok:
  Logging to logging@openlogging.org accepted
ha_federated.h:
  removed quote_data and type_quote (now in the Field class)
ha_federated.cc:
  moved quote_data and type_quote to field class
field.h:
  new methods quote_data and needs_quotes declared
field.cc:
  new field class methods quote_data and needs_quotes (per Monty's request)
federated.test:
  more tests, joins, index tests
have_federated_db.require:
  new name of federated system var
federated.result:
  new test results for federated handler
have_federated_db.inc:
  changed name of variable in test due to change in vars
sql_analyse.cc:
  over-ridden append_escaped to take (String *, char *, uint) per requirements of 'create_where_from_key' method in federated handler.
mysql_priv.h:
  define over-ridden append_escaped to take arguments from 'create_where_from_key' method in federated handler 
ha_federated.cc:
  implemented "create_where_from_key" to deal properly with two-byte prefix and multi keys. Initial testing shows it works, but I still need to move quoting to field class and also look at changes per Segei's suggestions.
 2005-01-20 18:36:40 -08:00
tomas@poseidon.ndb.mysql.com
b1877967d1 ndb_autodiscover.result, ndb_autodiscover.test: 
removed this since it easily gives errors if previous tests fail
 2005-01-20 21:26:58 +01:00
joreland@mysql.com
abd6afa9af Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-20 20:51:20 +01:00
tomas@poseidon.ndb.mysql.com
39c9f50ac9 mysql-test-run.sh: 
skip ndbcluster start failure if --force given
 2005-01-20 20:27:17 +01:00
joreland@mysql.com
de2bbb3018 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-01-20 19:54:17 +01:00
ingo@mysql.com
9bf63b1436 Merge mysql.com:/home/mydev/mysql-5.0 
into mysql.com:/home/mydev/mysql-5.0-5000
 2005-01-20 16:41:09 +01:00
ingo@mysql.com
f5d36349a9 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2005-01-20 16:20:34 +01:00
ingo@mysql.com
d39d19005f Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-4000
 2005-01-20 16:17:33 +01:00
tomas@poseidon.ndb.mysql.com
86197400bc Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
 2005-01-20 15:37:27 +01:00
tomas@poseidon.ndb.mysql.com
dd6958eb20 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-01-20 15:21:00 +01:00
kent@mysql.com
7885d70b88 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-01-20 14:16:29 +01:00
tomas@poseidon.ndb.mysql.com
ac53ecce1c added variable NDB_MGM to be able to run the management client in tests 
added testcase for Bug#8035
    added option to wait for not-started
    Bug#8035
 2005-01-20 13:45:42 +01:00
bar@mysql.com
6b5c7c7290 Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-20 16:08:27 +04:00
bell@sanja.is.com.ua
3bd203d3f6 fixed problem with distinct select with grouping and subqueries (BUG#7946) 2005-01-20 13:56:22 +02:00
kent@mysql.com
f4cdb433c6 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-01-20 12:40:42 +01:00
bar@mysql.com
ca48cfbfcc item_cmpfunc.cc: 
Bug#7834 Illegal mix of collations in IN operator
  IN was the first function supporting 
  character set convertion.
  agg_arg_charsets() was written afterwards,
  which is more flexible.
  Now IN just reuses this function.
 2005-01-20 15:38:56 +04:00
ram@gw.mysql.r18.ru
dfe8132fb4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-20 14:22:02 +04:00
joreland@mysql.com
bca4f68773 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-20 10:13:45 +01:00
sergefp@mysql.com
a5a99cf7a9 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-20 11:57:30 +03:00
ram@gw.mysql.r18.ru
c397751373 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-20 12:56:18 +04:00
dlenev@brandersnatch.localdomain
348218d21d Fix for bug #7637: "Test failure: 'user_limits' on QNX and 64-bit systems" 
Made user_limits.test scheduling independant (this solves failure on QNX).

Made sys_var_max_user_conn variable int sized. Changed 
max_user_connections from ulong to uint to be able to use it in 
sys_var_max_user_conn::value_ptr() (solves failures on 64-bit platforms).
 2005-01-20 00:54:01 +03:00
ingo@mysql.com
ea8882be80 BUG#6034 - Error code 124: Wrong medium type. 
Version for 5.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
Now the preparation is split into two prepare methods.
The first detects the situation and defers some preparations
until the second phase.
 2005-01-19 21:20:55 +01:00
ingo@mysql.com
fd0fdcdaa8 BUG#6034 - Error code 124: Wrong medium type. 
Version for 4.1. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.
 2005-01-19 21:16:27 +01:00
ingo@mysql.com
9a914a0022 BUG#6034 - Error code 124: Wrong medium type. 
Version for 4.0. Committed for merge.
If the result table is one of the select tables in INSERT SELECT,
we must not disable the result tables indexes before selecting.
mysql_execute_command() detects the match for other reasons and
adds the flag OPTION_BUFFER_RESULT to the 'select_options'. 
In this case the result is put into a temporary table first. 
Hence, we can defer the preparation of the insert
table until the result is to be used.
 2005-01-19 21:13:30 +01:00
sergefp@mysql.com
9a7a47c21c Merge mysql.com:/dbdata/psergey/mysql-4.1-bug7885 
into mysql.com:/dbdata/psergey/mysql-5.0-bug7885
 2005-01-19 23:11:50 +03:00
sergefp@mysql.com
b1c3e43060 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-bug7885
 2005-01-19 23:02:28 +03:00
tulin@build.mysql.com
16f77ce996 Merge build.mysql.com:/users/tulin/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb
 2005-01-19 14:20:28 +01:00
gluh@gluh.mysql.r18.ru
c1b92f6a90 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-19 16:20:25 +03:00
gluh@gluh.mysql.r18.ru
994c1fd4d8 View field names should be case insensitive 2005-01-19 16:19:10 +03:00
ram@gw.mysql.r18.ru
1b106c1fe1 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-19 14:20:50 +04:00
tulin@build.mysql.com
c24b6aa125 Merge build.mysql.com:/users/tulin/mysql-5.0 
into build.mysql.com:/users/tulin/mysql-5.0-ndb
 2005-01-19 10:31:09 +01:00
tulin@build.mysql.com
cb995131fb Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into build.mysql.com:/users/tulin/mysql-5.0
 2005-01-19 10:07:13 +01:00
tomas@poseidon.ndb.mysql.com
2776424102 added possibility to add extra opts to ndbd and ndb_mgmd in mysql-test-run 2005-01-19 10:00:41 +01:00
ram@gw.mysql.r18.ru
f131e5a925 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gw.mysql.r18.ru:/usr/home/ram/work/5.0.b6999
 2005-01-19 12:05:59 +04:00
ram@gw.mysql.r18.ru
c24c023e8c A fix (bug #6999: Traditional: Wrong SQLSTATE returned for string truncation). 2005-01-19 12:04:35 +04:00
joreland@mysql.com
2af06e0b32 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-01-19 07:37:42 +01:00
jimw@mysql.com
20552486e5 Fix test results from merge, and fix the symlink test which had an 
out-of-sync test and result.
 2005-01-18 15:05:16 -08:00
jimw@mysql.com
1edf7279ef Merge from 4.1. 2005-01-18 13:59:55 -08:00
jimw@mysql.com
06f60f6d65 Merge bk-internal:/home/bk/mysql-4.1 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-01-18 13:34:22 -08:00
Sinisa@sinisa.nasamreza.org
a2e0ecbf03 after merge fixes 2005-01-18 23:34:15 +02:00
Sinisa@sinisa.nasamreza.org
08639a88b2 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2005-01-18 23:29:47 +02:00
Sinisa@sinisa.nasamreza.org
477047401c fixing wrong value for "examined rows" when UNION's are used. 2005-01-18 23:13:29 +02:00
jimw@mysql.com
1ffa2a3dc4 Update type_float test results after merge. 2005-01-18 13:12:40 -08:00
sergefp@mysql.com
48d7fe1671 Fix for valgrind failures in get_mm_tree. 2005-01-18 23:50:42 +03:00
jimw@mysql.com
2fac8bd044 Merge changed tests 2005-01-18 12:25:56 -08:00
dlenev@mysql.com
001aa1096f Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-01-18 21:52:15 +03:00
bar@mysql.com
efe6ea9363 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-18 22:30:28 +04:00
bar@mysql.com
4438d2d569 ps_7ndb.result, ps_6bdb.result: 
after merge clean-up
 2005-01-18 22:29:21 +04:00
dlenev@mysql.com
af878017b2 Merge mysql.com:/home/dlenev/src/mysql-4.1-merges 
into mysql.com:/home/dlenev/src/mysql-5.0-merges
 2005-01-18 21:27:09 +03:00
jani@ua141d10.elisa.omakaista.fi
04ee95729c Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0 
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-01-18 20:17:24 +02:00
jani@ua141d10.elisa.omakaista.fi
625ae2c5a0 Added possibility to use --error <name> instead of --error <number> 
The old syntax works as well. WL#2356.
 2005-01-18 20:16:21 +02:00
bar@mysql.com
05204a9b3c After-merge clean-up 2005-01-18 22:12:33 +04:00
bar@mysql.com
f93bfe06b3 merge 2005-01-18 21:38:40 +04:00
sergefp@mysql.com
a55f4a5da4 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 19:49:00 +03:00
dlenev@brandersnatch.localdomain
0787a97b1c Added test for bug #7884 "Able to add invalid unique index on TIMESTAMP 
prefix", which roots were fixed in 4.0 tree.
 2005-01-18 17:45:49 +03:00
gluh@gluh.mysql.r18.ru
c965dc34cd Fix for bug #7981: SHOW GLOBAL STATUS crashes server 2005-01-18 17:37:45 +03:00
sergefp@mysql.com
b1d55200b1 Fix for BUG#7885 2005-01-18 17:26:05 +03:00
sergefp@mysql.com
d89166cd34 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-fix-vg1
 2005-01-18 16:46:26 +03:00
bar@mysql.com
8cfe729678 1. Item now uses my_charset_bin by default, 
not default_charset_into. It fixes the
problem that in some cases numbers where
treated as CHAR(N), not as BINARY(N), e.g.
wrong 'charsetnr' when sent to the client side.
2. IFNULL didn't aggregate argument charsets
and collations, so IFNULL(1,'a') produced
a CHAR(N). Now produces a BINARY(N).
3. SELECT PROCEDURE ANALIZE now returns
BINARY columns, which is much better than it worked
previously: CHAR with the default character set.
But in the future it's worth to fix the fields
'Field_name' and 'Optimal_fieldtype' to use UTF8,
and 'Min_value' and 'Max_value' to inherit their charsets
from the original items. But it is not important,
and BINARY(N) is OK for now.
4. Tests were fixed accordingly. No new tests were
made, as the old onces cover everything.
 2005-01-18 17:41:06 +04:00
serg@serg.mylan
b53757ba91 Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2005-01-18 11:45:41 +01:00
serg@serg.mylan
b4624288a7 myisam/ft_boolean_search.c 
-trunc* bug - don't increase yweaks in this case
 2005-01-18 11:27:38 +01:00
bar@mysql.com
b2dbddc39d Merge mysql.com:/usr/home/bar/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-5.0
 2005-01-18 10:45:09 +04:00
bar@mysql.com
8f23e90232 #7874: CONCAT() gives wrong results mixing latin1 field and utf8 string literals 
We should not overwrite res if it is returned from a const item.
 2005-01-18 10:42:29 +04:00
monty@mysql.com
9ad75d8c75 After merge fixes 2005-01-18 05:07:22 +02:00
monty@mysql.com
502ba93b38 Merge with global tree 2005-01-18 04:03:26 +02:00
jimw@mysql.com
a35c324358 Fix over-optimization that could result in an unsigned double field being 
set to a negative value. (Bug #7700)
 2005-01-17 16:13:56 -08:00
timour@mysql.com
bb77b2e55f Fix for BUG#7331 merged manually from 4.1. 2005-01-17 17:19:33 +02:00
timour@mysql.com
06fce173c0 Merge mysql.com:/home/timka/mysql/src/4.1-virgin 
into mysql.com:/home/timka/mysql/src/4.1-bug-7331
 2005-01-17 12:41:59 +02:00
bar@deer.(none)
2933cd3d35 user_var.result: 
after merge fix
 2005-01-17 13:58:16 +04:00
bar@deer.(none)
3b7eb23e6b func_str.result: 
after merge fix
 2005-01-17 13:23:56 +04:00
bar@mysql.com
e7e5e8b1e7 user_var.result, func_str.result, item_strfunc.cc: 
bug#7839 ncorrect collation for char(ascii('a'))
 2005-01-17 10:38:35 +04:00
sergefp@mysql.com
6303ca7efa Fixes in opt_range.cc: ROR plan choice code 
* Removed unused parameters 
 * Fixed several cost calculation errors in ror_intersect_add
 * Better code structure for ror_intersect_add and get_best_ror_intersect
 2005-01-17 00:18:19 +03:00
guilhem@mysql.com
05793bb9b9 Merge 2005-01-16 21:39:21 +01:00
jimw@mysql.com
65b800736f Merge bk-internal:/home/bk/mysql-5.0 
into mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-01-15 10:14:34 -08:00
jimw@mysql.com
96f0219de8 Update results after merge 2005-01-15 10:14:12 -08:00
dlenev@brandersnatch.localdomain
31d3aabb49 Porting fix for bug #7586 "TIMEDIFF for sec+microsec not working properly" 
to 5.0 tree (since it was lost during last merge).
 2005-01-15 20:02:46 +03:00
kent@mysql.com
d46ce19e64 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
 2005-01-15 16:48:20 +01:00
monty@mysql.com
8d616390e9 After merge fixes 
Fix for BIT(X) field as string
 2005-01-15 17:38:43 +02:00
monty@mysql.com
3b0f8cabaf Merge with global tree 2005-01-15 14:39:16 +02:00
monty@mysql.com
0a1076a25f Merge with 4.1 2005-01-15 14:09:45 +02:00
monty@mysql.com
a37e91e435 Changed interface for my_strntod() to make it more general and more portable 2005-01-15 12:28:38 +02:00