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
29406 commits 2784 branches 343 tags 1.6 GiB
Commit graph

9726 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
aacf783e86 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-15 10:53:25 +01:00
aelkin@mysql.com
42cc473df3 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-02-14 20:19:00 +02:00
aelkin@mysql.com
6423fe2d49 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-14 20:15:17 +02:00
evgen@moonbone.local
131217eb6f Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/16272-bug-5.0-mysql
 2006-02-14 19:46:35 +03:00
msvensson@neptunus.(none)
9a06392b2f Merge neptunus.(none):/home/msvensson/mysql/bug17233/my50-bug17233 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-14 17:25:44 +01:00
msvensson@neptunus.(none)
dc5bb00467 Enable ndb_load test case 2006-02-14 17:21:18 +01:00
msvensson@neptunus.(none)
52183ddd78 Change from std_data to std_data_ln 2006-02-14 17:15:24 +01:00
msvensson@neptunus.(none)
fed5a68ea8 Merge neptunus.(none):/home/msvensson/mysql/bug17280/my50-bug17280 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-14 15:34:30 +01:00
evgen@moonbone.local
8f904e9cab Fixed bug#16272: IF function with decimal args can produce wrong result 
The Item_func_if::fix_length_and_dec() function when calculating length of 
result doesn't take into account unsigned_flag. But it is taken when 
calculating length of temporary field. This result in creating field that 
shorter than needed. Due to this, in the reported query 40.0 converted to 9.99.

The function Item_func_if::fix_length_and_dec() now adds 1 to the max_length if 
the unsigned_flag isn't set.
 2006-02-14 16:22:37 +03:00
aelkin@mysql.com
5bd5967bdb Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.0
 2006-02-14 12:44:26 +02:00
aelkin@mysql.com
4f85993945 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-14 12:42:27 +02:00
bar@mysql.com
cc3623aecf Many files: 
Backporting character_set_filesystem from 5.0 to 5.1.
 2006-02-14 08:24:01 +04:00
igor@rurik.mysql.com
de6eedd756 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-13 18:56:42 -08:00
igor@rurik.mysql.com
75b6930d54 Fixed bug #16603. 
A subquery transformation changes the HAVING clause of the embedding query if the subquery contains
a GROUP BY clause. Yet the split_sum_func2 function was not applied to the modified HAVING clause.
This could result in wrong answers.
 2006-02-13 18:50:06 -08:00
petr@mysql.com
f20955af40 fix Bug#12813 "Instance Manager: START/STOP INSTANCE 
commands accept a list as argument"
 2006-02-14 03:09:17 +03:00
aelkin@mysql.com
e7a0822a47 Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/5.0-bug16217
 2006-02-13 19:17:02 +02:00
aelkin@mysql.com
0866e4267a Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-4.1 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/FIXES/mysql-4.1-bug16217
 2006-02-13 19:15:02 +02:00
aelkin@mysql.com
312f68133c Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-13 19:13:33 +02:00
SergeyV@selena.
da94b1662b Fixes bug #15943. resets error flag for show create view command, to allow 
proper processing of multiple sql statements sent as a single command.
 2006-02-13 19:53:34 +03:00
pem@mysql.com
d67b0a6bf6 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug16896/mysql-5.0
 2006-02-13 15:54:03 +01:00
pem@mysql.com
292ec72185 Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime 
into  mysql.com:/extern/mysql/5.0/bug16896/mysql-5.0
 2006-02-13 13:02:35 +01:00
kent@mysql.com
f9a23667b2 Merge 2006-02-12 04:33:50 +01:00
kent@mysql.com
30b8a9c1fb spatial.cc: 
Added { ... } around float8get() macro, avoids VC7 error
  message "illegal else without matching if"
mtr_report.pl:
  Parse error logs to create "warnings" file
mtr_cases.pl:
  Added optoion --ignore-disabled-def
  Windows build now let TZ pass, removed
  work around
mysql-test-run.pl, mtr_process.pl:
  Back port of changes from 5.0
 2006-02-12 04:13:24 +01:00
knielsen@mysql.com
9025342992 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/usr/local/mysql/mysql-4.1-fixrace
 2006-02-12 00:19:59 +01:00
knielsen@mysql.com
5346bf7392 Merge mysql.com:/usr/local/mysql/mysql-4.1-fixrace 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2006-02-12 00:10:43 +01:00
kent@mysql.com
c94b3638f1 Merge 2006-02-11 23:44:56 +01:00
kent@mysql.com
2619c54bd1 mysql-test-run.{pl,sh}: 
Give space for second and third slave port
 2006-02-11 23:35:23 +01:00
knielsen@mysql.com
43189fd8ad Fix a race on some platforms in mysql-test-run.pl, where it would sometimes 
errorneously abort reporting failure to kill child processes, where in
reality the problem was merely that the child had become a zombie because
of missing waitpid() call.
 2006-02-11 22:50:59 +01:00
sergefp@mysql.com
f95b5b0a5d BUG#17314: Can't use index_merge/intersection for MERGE tables 
1. Fix index access costs for MERGE tables, set block_size=myisam_block_size/#underlying_tables 
   instead of 0 which it was before.
2. Make index scans on MERGE table to return records in (key_tuple, merge_table_rowid) order, 
   instead of just (key_tuple) order. This makes an index scan on MERGE table to be truly a ROR-scan
   which is a requirement for index_merge union/intersection.
 2006-02-11 21:51:43 +03:00
kent@mysql.com
5fe2e8fd7d mysql-test-run.pl: 
Display instance manager port
mysql-test-run.sh:
  Give port space for more than one slave
 2006-02-10 19:56:34 +01:00
kent@mysql.com
f8e08f38fe Merge 2006-02-10 19:47:46 +01:00
kent@mysql.com
d23d02be18 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2006-02-10 19:18:45 +01:00
tomas@poseidon.ndb.mysql.com
9663f6cbee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-10 18:16:34 +01:00
tomas@poseidon.ndb.mysql.com
cbac75de91 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2006-02-10 17:53:13 +01:00
tomas@poseidon.ndb.mysql.com
27a14f93eb Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-10 17:50:17 +01:00
tomas@poseidon.ndb.mysql.com
7050a7586e Bug #17249 ndb, delete statement with join where clause fails when table do not have pk 
Bug #17257 ndb, update fails for inner joins if tables do not have Primary Key

change: the allocated area by setValue may not be around for later, store hidden key in special member variable instead
 2006-02-10 17:40:22 +01:00
aelkin@mysql.com
14ced05e55 BUG#16217 fix partly backported from 5.0. It is different in mysqlbinlog part. 
This changeset is assumed to stay in 4.1.
 2006-02-10 15:12:27 +02:00
msvensson@neptunus.(none)
4217699e56 Bug#17280 mysqltest, --echo sometimes does not expand $variables 
- Evaluate all variables in the text before printing it to result file
 2006-02-10 12:11:16 +01:00
petr@mysql.com
f037d4772e Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/cps/mysql/devel/5.0-mike
 2006-02-10 10:56:27 +03:00
petr@mysql.com
1c7bc08537 a bunch of IM fixes from the GUI team 2006-02-10 02:15:55 +03:00
ramil@mysql.com
e1dabf65e4 Merge mysql.com:/usr/home/ram/work/4.1.heap 
into  mysql.com:/usr/home/ram/work/mysql-5.0
 2006-02-09 18:23:37 +04:00
aelkin@mysql.com
dd2a44c497 BUG#16217 forced to introduce a separate mysql client command to adopt its 
internal charset to one associated with currently being handled query. 
To note such a query can come from interactive client either.

There was a discussion within replication team and Monty who's suggestion won.
It avoids straightforward parsing of all `set' queries that could affect client side 
character set. 
According to the idea, mysql client does not parse `set' queries but rather cares of
`charset new_cs_name' command.
This command is generated by mysqlbinlog in form of exclaiming comment (Lars' suggestion)
so that enlightened clients like `mysql' knows what to do with it.

Interactive human can switch between many multi-byte charsets during the session 
providing the command explicitly. 
To note that setting new internal mysql's charset does not
trigger sending any `SET' sql statement to the server.
 2006-02-09 16:23:09 +02:00
aelkin@mysql.com
7b6afbd534 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-09 15:20:39 +02:00
bell@sanja.is.com.ua
110ac55e4b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-02-09 15:13:20 +02:00
pem@mysql.com
6f170782b2 Fixed BUG#16896: Stored function: unused AGGREGATE-clause in CREATE FUNCTION 
Check if AGGREGATE was given with a stored (non-UDF) function, and return
  error in that case.
  Also made udf_example/udf_test work again, by adding a missing *_init()
  function. (_init() functions required unless --allow_suspicious_udfs is
  given to the server, since March 2005 - it seems udf_example wasn't updated
  at the time.)
 2006-02-09 13:00:32 +01:00
msvensson@neptunus.(none)
32c2712083 Bug#16878 dump of trigger 
- Pass "in_comment" variable on to new lex in sp_head::reset_lex
 - Add testcases for dumping and reloading trigger without BEGIN/END
 2006-02-09 11:05:28 +01:00
msvensson@neptunus.(none)
63aca4de7b Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-09 10:35:47 +01:00
msvensson@neptunus.(none)
35fc3dcc99 Force stop of old cluster 2006-02-09 10:25:14 +01:00
msvensson@neptunus.(none)
74af19958e Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_faster/my50-mysqltestrun_faster 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-09 09:57:07 +01:00
msvensson@neptunus.(none)
0e9e1f2c5d Start cluster only for testcases that really needs it and stop it when 
not needed by the tescases. This will save test time for those testcases
that does not need cluster, but need a restart, as they dont have to wait
the extra time it would take for cluster to restart. It will also save
time for other testcases, as cluster does not 
need to be contacted for each table to be dropped or created.
Backport from 5.1
 2006-02-09 09:40:48 +01:00
bell@sanja.is.com.ua
daaf883f97 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-02-09 10:26:06 +02:00
tomas@poseidon.ndb.mysql.com
8d1e578cef Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-08 14:08:45 +01:00
tomas@poseidon.ndb.mysql.com
6295103f96 Bug#17233, disabled test in waiting for bug fix 2006-02-08 14:07:52 +01:00
ramil@mysql.com
34abab41db Removed 'delayed' to make the test deterministic (as the bug itself has nothing to do with 'delayed'). 2006-02-08 16:00:39 +04:00
bell@sanja.is.com.ua
ded01c3b6f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-02-08 10:36:42 +02:00
pekka@mysql.com
14249f23ed Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-02-07 21:52:56 +01:00
bell@sanja.is.com.ua
6916a4bfe6 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
 2006-02-07 22:10:44 +02:00
gunnar@mysql.com.
f6590a3b89 Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com.:/data/BK/mysql-5.0
 2006-02-07 20:50:28 +01:00
pekka@mysql.com
05353723f0 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/space/pekka/ndb/version/my50
 2006-02-07 20:04:54 +01:00
pekka@mysql.com
9aa06f3bc1 ndb - bug#15918 fix 2006-02-07 19:57:31 +01:00
gunnar@mysql.com.
a0b0cb5551 Merge mysql.com.:/data/BK/mysql-5.0 
into  mysql.com.:/data/BK/mysql-5.0_8461_b
 2006-02-07 17:15:12 +01:00
gunnar@mysql.com.
001224c09d item_func.cc: 
fix for bug#8461

  BUG 8461 - TRUNCATE returns incorrect result if 2nd argument is negative
  Reason: Both TRUNCATE/ROUND converts INTEGERS to DOUBLE and back to INTEGERS
  Changed the integer routine to work on integers only.
  This bug affects 4.1, 5.0 and 5.1
  Fixing in 4.1 will need to change the routine to handle different types individually.
  5.0 did had different routines for different types already just the INTEGER routine was bad.
 2006-02-07 13:26:35 +01:00
bell@sanja.is.com.ua
84900213dd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2006-02-07 14:23:16 +02:00
bell@sanja.is.com.ua
5923d50533 kill.test fixed for kill on Mac OS X (which do not send OK) 2006-02-07 13:45:16 +02:00
svoj@april.(none)
328b59a5ed Merge april.(none):/home/svoj/devel/mysql/merge/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-5.0
 2006-02-07 15:30:32 +04:00
svoj@april.(none)
a67d8f9043 Merge april.(none):/home/svoj/devel/mysql/BUG14496/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/merge/mysql-4.1
 2006-02-07 13:49:03 +04:00
tomas@poseidon.ndb.mysql.com
3f6671d72a Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2006-02-07 00:06:28 +01:00
tomas@poseidon.ndb.mysql.com
5bbb5c29b7 Bug #17154 load data infile of char values into a table of char(PK) hangs 
Bug #17158  	load data infile of char values into table of char with no (PK) fails to load
Bug #17081  	Doing "LOAD DATA INFILE" directly after delete can cause missing data
 2006-02-07 00:03:39 +01:00
igor@rurik.mysql.com
b25b4e9b5e Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-06 11:40:39 -08:00
igor@rurik.mysql.com
3af0eabc7f Fixed bug #16203. 
If check_quick_select returns non-empty range then the function cost_group_min_max
cannot return 0 as an estimate of the number of retrieved records.
Yet the function erroneously returned 0 as the estimate in some situations.
 2006-02-06 11:35:13 -08:00
pem@mysql.com
c289a3b60e Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0
 2006-02-06 17:58:15 +01:00
pem@mysql.com
62d2511df5 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug16303/mysql-5.0
 2006-02-06 16:07:13 +01:00
pem@mysql.com
5debbc9e8a Updated sp-code.result after merge (BUG#16568) 2006-02-06 16:05:46 +01:00
pem@mysql.com
2d340a875c Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug16568/mysql-5.0
 2006-02-06 14:09:14 +01:00
aelkin@mysql.com
217499df86 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-04 10:25:46 +02:00
pekka@mysql.com
c696582df4 ndb - replace+tinyblob back-patch from 5.0 [ discard on 4.1->5.0 merge ] 2006-02-03 15:23:58 +01:00
pekka@mysql.com
7b892368c3 ndb - bugfix: tinyblob + replace => mysqld crash (no bug#) 2006-02-03 14:35:29 +01:00
igor@rurik.mysql.com
66b6c988f5 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-03 00:07:57 -08:00
igor@rurik.mysql.com
7b58b91fe4 Fixes after manual merge 2006-02-02 23:56:08 -08:00
igor@rurik.mysql.com
f61517d60b Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-02 21:23:36 -08:00
igor@rurik.mysql.com
3f9bb37461 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  rurik.mysql.com:/home/igor/mysql-5.0
 2006-02-02 17:39:38 -08:00
konstantin@mysql.com
cb7118edcd One more post-merge fix. 2006-02-03 02:01:01 +03:00
igor@rurik.mysql.com
b32ce5ac79 Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-02-02 13:47:21 -08:00
konstantin@mysql.com
303ad65fb2 Post-merge fixes. 2006-02-03 00:07:36 +03:00
konstantin@mysql.com
98091b152a Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-02-02 18:17:18 +03:00
aelkin@mysql.com
d19f3f07e4 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-02-02 10:55:54 +02:00
msvensson@neptunus.(none)
264640c532 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-02 08:23:24 +01:00
igor@rurik.mysql.com
86606615ab Fixed bug #16382. 
When an ambiguous field name is used in a group by clause a warning is issued
in the find_order_in_list function by a call to push_warning_printf.
An expression that was not always valid was passed to this call as the field
name parameter.
 2006-02-01 20:43:43 -08:00
svoj@april.(none)
332be5bdd9 BUG#14496: Crash or strange results with prepared statement, 
MATCH and FULLTEXT
Fixed that fulltext query using PS results in unexpected behaviour
when executed 2 or more times.
 2006-02-01 20:40:12 +04:00
ingo@mysql.com
c5a7bffcee Bug#8841 - CHECKSUM TABLE is broken in MyISAM 
There are (at least) two implementations of the checksum
computation. One is in MyISAM for the quick checksum. It
is executed on every row change. The other is in the
SQL layer for the extended checksum. It retrieves all rows
of a table via the respective storage engine.

In former MySQL versions varchars were stored with their 
maximum length, but now with their real length similar to
blobs.

This change had been forgotten to take care of in the
extended checksum calculation. Hence too much data was
checksumed. In MyISAM this change had been taken care of 
already. Only the real data is included in the checksum.

I changed mysql_checksum_table() so that it uses the
length information of true varchar fields instead
of the field length like in former varchar 
implementations.
 2006-02-01 16:46:44 +01:00
pem@mysql.com
526a974460 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15011/mysql-5.0
 2006-02-01 16:01:22 +01:00
msvensson@neptunus.(none)
df5a947ba7 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_float_result/my50-mysqltest_float_result 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-02-01 15:02:36 +01:00
pem@mysql.com
a84c7e1c29 Added new test case for BUG#14533: 'desc tbl' in stored procedure causes error 1142 
which is no longer repeatable. (Unclear when this was fixed.)
 2006-02-01 14:46:30 +01:00
pem@mysql.com
d37570daf4 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/cantrepeat/mysql-5.0
 2006-02-01 12:31:48 +01:00
msvensson@neptunus.(none)
102aa5a79f Use common function 'append_field' to output the value of one field to the result. 
Fix for extra zero in exponent of double values on windows.
 2006-02-01 11:36:32 +01:00
igor@rurik.mysql.com
d6370b48a7 FIxed bug #14927. 
A query with a group by and having clauses could return a wrong
result set if the having condition contained a constant conjunct 
evaluated to FALSE.
It happened because the pushdown condition for table with
grouping columns lost its constant conjuncts.
Pushdown conditions are always built by the function make_cond_for_table
that ignores constant conjuncts. This is apparently not correct when
constant false conjuncts are present.
 2006-01-31 21:48:32 -08:00
aivanov@mysql.com
bba8155516 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss162
 2006-01-31 21:49:20 +03:00
aivanov@mysql.com
9296fb241d Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582. 
Applied innodb-5.0-ss149/162 snapshots.
 2006-01-31 21:41:48 +03:00
pem@mysql.com
b3ebd755cc Added test case for BUG#15091: Sp Returns Unknown error in order clause....and there is 
no order by clause
which was fixed by earlier changesets.
The error message is now the more generic "Unknown table ... in field list".
 2006-01-31 17:00:50 +01:00
pem@mysql.com
af11dc3cbe Added test case for BUG#14270: Stored procedures: crash if load index 
which was fixed by earlier changesets; LOAD INDEX is not allowed in functions.
  Also testing CACHE INDEX, while OPTIMIZE and CHECK were covered by existing tests already.
 2006-01-31 16:27:57 +01:00
knielsen@mysql.com
a6b86d8962 Merge bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2006-01-31 16:24:25 +01:00
aelkin@mysql.com
8c9a6cd7c9 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-01-31 16:11:33 +02:00
dlenev@mysql.com
7715538018 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829
 2006-01-31 15:51:55 +03:00
pem@mysql.com
e2360cf745 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
 2006-01-31 12:47:36 +01:00
dlenev@mysql.com
a25ca5fa63 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg16829
 2006-01-31 14:43:41 +03:00
msvensson@neptunus.(none)
10036d354c Check std_data_ln already created 
Add / to std_data in ln command
 2006-01-31 10:48:40 +01:00
pem@mysql.com
c9476999ef Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
 2006-01-31 09:49:54 +01:00
msvensson@neptunus.(none)
6b136726b3 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-31 09:39:51 +01:00
msvensson@neptunus.(none)
a71de6bfe2 Bug #16919 some tests fail in 5.0 
- Use "../tmp" as --slave-load-tmpdir. Same as in mysql-test-run.pl
 2006-01-31 09:38:40 +01:00
knielsen@mysql.com
a002d316ed Fix missing --replace_result on $SLAVE_MYPORT in federated. 2006-01-31 09:15:28 +01:00
msvensson@neptunus.(none)
b7c3d5ef86 Update trigger-grant-test to use MYSQLTEST_VARDIR 2006-01-31 08:51:21 +01:00
patg@govinda.patg.net
1ab24c0b55 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.0
 2006-01-30 10:55:24 -08:00
aelkin@mysql.com
f40434a772 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/mysql-5.0
 2006-01-30 20:37:04 +02:00
pem@mysql.com
1043e1ba84 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15737/mysql-5.0
 2006-01-30 15:06:33 +01:00
pem@mysql.com
67f34be961 Post-review fix for BUG#15737 (corrected typo in sp-code.test comment) 2006-01-30 15:04:00 +01:00
aelkin@mysql.com
53dd7f61f7 BUG#13227 test case to examine that local slave's triggers that use select work ok even if they fire 
for replicated update.
 2006-01-30 14:33:15 +02:00
aivanov@mysql.com
efe8b884e5 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/alexi/innodb/mysql-4.1-merged
 2006-01-30 15:31:35 +03:00
aivanov@mysql.com
fe518520be Fixed BUG#16387. 
Applied innodb-4.1-ss17 snapshot.
  Do not mistake TABLENAME_ibfk_0 for auto-generated id.
 2006-01-30 15:17:33 +03:00
msvensson@neptunus.(none)
ae9b056d9b Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
 2006-01-30 10:45:45 +01:00
paul@snake-hub.snake.net
b4f8b1b376 information_schema_db.result, information_schema.result: 
Fix test result.
table.h, sql_show.cc:
  Put I_S tables in lexical order.
 2006-01-28 19:44:51 -06:00
kent@mysql.com
3a2e8ebeee mysql-test-run.pl: 
Aligned the MTR_BUILD_THREAD policy to shell version
 2006-01-28 13:04:01 +01:00
kent@mysql.com
f188972456 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2006-01-28 12:39:25 +01:00
kent@mysql.com
c64727e7c0 mysql-test-run.sh: 
Bug#16780: Extend port range to make space for 5.1 NDBCLUSTER_PORT_SLAVE
 2006-01-28 12:35:46 +01:00
dlenev@mysql.com
737084b229 Fix for bug #16829 "Firing trigger with RETURN crashes the server" 
We should disallow usage of RETURN statement in triggers and emit
error at parsing time (instead of crashing when trigger is fired).
 2006-01-28 12:50:16 +03:00
igor@rurik.mysql.com
eb8507208e Fixed bug #16260. 
The problem has manifested itself in the cases when we have a nested outer join
for which it can be inferred that one of the inner tables is a single row table.
 2006-01-27 21:20:28 -08:00
patg@govinda.patg.net
15ec4431bc BUG# 14768 
Added fixes to make last_insert_id() to work.
 2006-01-27 15:43:44 -08:00
msvensson@neptunus.(none)
d18006173f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2006-01-27 19:11:59 +01:00
pappa@c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
a69827f152 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  c-5c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12796
 2006-01-27 09:29:59 -05:00
msvensson@neptunus.(none)
9c255c4025 Enable kill test 2006-01-27 13:23:10 +01:00
msvensson@neptunus.(none)
54af4e6d0c Merge neptunus.(none):/home/msvensson/mysql/mysqltestrun_check_testcases/my50-mysqltestrun_check_testcases 
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
 2006-01-27 10:49:07 +01:00
msvensson@neptunus.(none)
a98ede7edc Use MYSQLTEST_VARDIR 2006-01-27 09:24:45 +01:00
bell@sanja.is.com.ua
8eee147e0f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1
 2006-01-26 19:01:54 +02:00
msvensson@neptunus.(none)
9304785c10 Add new option "check-testcases" to mysql-test-run.pl 
Cleanup the sideeffects from most of the  testcases with sideeffects.
 2006-01-26 17:54:34 +01:00
pem@mysql.com
ff4e2892b7 Fixed on BUG#16568: Continue handler with simple CASE not working correctly 
After trying multiple inheritance (to messy and hard make it work) and
  sublassing jump_if_not (worked, but ugly), decided to on this solution
  instead:
  Inserting an abstract sp_instr_opt_meta class as parent for all instructions
  with destinations makes it possible to handle a continuation pointer for
  sp_instr_set_case_expr too.
  Note: No special test case; the fix is captured by the changed behaviour of
  bug14643_2, and bug14498_4 (formerly disabled), in sp.test.
 2006-01-26 17:26:25 +01:00
bell@sanja.is.com.ua
43e281d79c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1
 2006-01-26 16:00:49 +02:00
pem@mysql.com
5b1fdbec53 Fixed BUG#16303: erroneus stored procedures and functions should be droppable 
Use a special lookup function for DROP, which doesn't attempt to parse the
  definition.
 2006-01-26 13:29:46 +01:00
msvensson@neptunus.(none)
169f1ecee6 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
 2006-01-26 12:51:27 +01:00
aelkin@mysql.com
58346adcc9 BUG#16487 importing the test case from 5.0 (the fix is done in BUG#15699) 2006-01-26 12:51:34 +02:00
aelkin@mysql.com
2fbdc5483a BUG#15699 importing the fix from 5.0 2006-01-26 12:49:55 +02:00
sergefp@mysql.com
cfce3d823b Merge 2006-01-26 00:06:20 +03:00
sergefp@mysql.com
5d0e8d81ee BUG#15935: In mysql_update, don't use full index scan when we could have used quick select scan. 2006-01-25 23:25:23 +03:00
pem@mysql.com
998f0c0aa3 Fixed BUGS#15011: error handler for mysql errno in nested block not activated 
For nested sql errno handlers (unlike sqlexception and other), we didn't stop
  searching when the innermost handler was found - now make sure we do.
 2006-01-25 17:19:54 +01:00
lars@mysql.com
865d8f8e89 Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0 
into  mysql.com:/users/lthalmann/bk/mysql-5.0-bug16487
 2006-01-25 17:17:16 +01:00
lars@mysql.com
c88dbea689 BUG#16487: New test for ignored table and multi-update 2006-01-25 16:14:27 +01:00
pem@mysql.com
f60a763208 Fixed BUG#15737: Stored procedure optimizer bug with LEAVE 
Second version.
  The problem was that the optimizer didn't work correctly with forwards jumps
  to "no-op" hpop and cpop instructions.
  Don't generate "no-op" instructions (hpop 0 and cpop 0), it isn't actually
  necessary.
 2006-01-25 15:11:49 +01:00
joerg@mysql.com
a473ac5d85 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/bug16730-5.0
 2006-01-25 07:34:32 +01:00
evgen@moonbone.local
baed6da5bc Manually merged 2006-01-24 22:10:39 +03:00
anozdrin@mysql.com
378147a23d Fix for the following bugs: 
- BUG#15166: Wrong update permissions required to execute triggers
  - BUG#15196: Wrong select permission required to execute triggers

The idea of the fix is to check necessary privileges
in Item_trigger_field::fix_fields(), instead of having "special variables"
technique. To achieve this, we should pass to an Item_trigger_field instance
a flag, which will indicate the usage/access type of this trigger variable.
 2006-01-24 20:15:12 +03:00
joerg@mysql.com
61f92945cc Merge mysql.com:/M41/bug16730-4.1 into mysql.com:/M50/bug16730-5.0 2006-01-24 18:00:23 +01:00
joerg@mysql.com
8d0378f542 Merge mysql.com:/M41/bug16730-4.1 into mysql.com:/M41/merge-4.1 2006-01-24 17:52:53 +01:00
msvensson@neptunus.(none)
c36e8861e3 Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var 
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
 2006-01-24 15:52:08 +01:00
msvensson@neptunus.(none)
b4af5d743e Make mysql-test-run.sh compatible 2006-01-24 15:51:02 +01:00
msvensson@neptunus.(none)
9f2a17816f Merge bk-internal:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
 2006-01-24 14:53:47 +01:00
joerg@mysql.com
1fa62bdafc Test "ctype_ucs": Disable warnings if "InnoDB" is not configured ("classic" build) (bug#16730). 2006-01-24 13:54:34 +01:00
aelkin@mysql.com
cf6becdebe Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
 2006-01-24 14:49:25 +02:00
gluh@eagle.intranet.mysql.r18.ru
b4f7c9bbd5 Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver) 
Fill schema tables with data before filesort if it's necessary
 2006-01-24 16:48:19 +04:00
msvensson@neptunus.(none)
bcf118b474 Merge 2006-01-24 13:33:00 +01:00
gluh@eagle.intranet.mysql.r18.ru
fa776a6f67 Fix for bug#15851 Unlistable directories yield no info from information_schema 
to skip directories which are not allowed for read
 2006-01-24 15:59:08 +04:00
msvensson@neptunus.(none)
3d5f530caa Merge neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var 
into  neptunus.(none):/home/msvensson/mysql/mysqltest_var/my50-mysqltest_var-integration
 2006-01-24 08:43:34 +01:00
msvensson@neptunus.(none)
09ec2919a1 Make it possible to run mysql-test-run.pl with default test suite in different vardir. 2006-01-24 08:30:54 +01:00
aelkin@mysql.com
4ba60488f6 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
 2006-01-23 22:32:05 +02:00
evgen@moonbone.local
b1967ad723 Fixed bug #16510: Updating field named like '*name' caused server crash. 
When setup_fields() function finds field named '*' it expands it to the list
of all table fields. It does so by checking that the first char of
field_name is '*', but it doesn't checks that the '* is the only char.
Due to this, when updating table with a field named like '*name', such field
is wrongly treated as '*' and expanded. This leads to making list of fields
to update being longer than list of the new values. Later, the fill_record() 
function crashes by dereferencing null when there is left fields to update,
but no more values.

Added check in the setup_fields() function which ensures that the field
expanding will be done only when '*' is the only char in the field name.
 2006-01-23 21:51:32 +03:00
svoj@april.(none)
18681229a0 Merge april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1 
into  april.(none):/home/svoj/devel/mysql/BUG16489/mysql-5.0
 2006-01-23 20:07:26 +04:00
aelkin@mysql.com
0fc8284de8 BUG#15699, failure to apply ignore rule for unexisting table. 
Since replication rules execute after `mysql_multi_update_prepare' returns we
delay to `break' in case this functions returns non-zero (some tables are not found) 
for to examine if there is an ignore rule for a not-found table. By doing that
it is guaranteed do/ignore replication rules logically preceed opening table routine.
 2006-01-23 18:03:09 +02:00
gvb@phoenix.(none)
5b9d686e87 Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  phoenix.(none):/data/mysql-4.1-BK
 2006-01-23 16:34:53 +01:00
svoj@april.(none)
4dc4502ab3 BUG#16489 - utf8 + fulltext leads to corrupt index file. 
Fixed that UPDATE statement crashes multi-byte charset fulltext index.
 2006-01-23 17:15:33 +04:00
gvb@phoenix.(none)
66cb90410c Merge gboehn@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  phoenix.(none):/data/mysql-4.1-BK
 2006-01-23 11:18:06 +01:00
holyfoot@eagle.intranet.mysql.r18.ru
12fcabbbf2 Merging 2006-01-21 21:50:54 +04:00
hf@eagle.intranet.mysql.r18.ru
4f368f9f93 Merging 2006-01-21 18:50:06 +04:00
hf@eagle.intranet.mysql.r18.ru
02ce3d0cad Merge hf@192.168.21.12:work/mysql-4.1.15429 
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
 2006-01-21 17:55:58 +04:00
hf@eagle.intranet.mysql.r18.ru
b91380456f Merge hf@192.168.21.12:work/mysql-4.1.9855 
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
 2006-01-21 17:53:29 +04:00
anozdrin@mysql.com
f2c3ed8e7b Test case for BUG#16621: INSERTs in Stored Procedures causes data corruption 
in the Binary Log.
 2006-01-20 17:21:39 +03:00
anozdrin@mysql.com
145fd62bc1 Fix for BUG#15588: String overrun during sp-vars.test 
The bug appears after implementation of WL#2984
(Make stored routine variables work according to the standard).
 2006-01-20 15:59:22 +03:00
pem@mysql.com
2c6ea2d2df Fix of fix for BUG#15866. (Actually change the fib() call in sp.test) 2006-01-20 08:32:22 +01:00
pem@mysql.com
28f3989c8a Fixed BUG#15866: Thread stack limit insufficient for recursive call "fib(20)" 
Lowered the parameter to 10, and also renamed non-standard table names to t3.
 2006-01-19 17:55:54 +01:00
pem@mysql.com
d894e3043e Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0
 2006-01-19 15:15:47 +01:00
stewart@mysql.com
c079e80122 reintroduce --no-defaults to ndb_mgmd 2006-01-20 00:08:26 +11:00
konstantin@mysql.com
fa5b4b55a0 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-01-19 15:23:01 +03:00
stewart@mysql.com
95e29a975a small typo fixes 2006-01-19 22:50:54 +11:00
pem@mysql.com
3a753667dd Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0
 2006-01-19 11:48:07 +01:00
pem@mysql.com
6fad448a49 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug14834/mysql-5.0
 2006-01-18 18:18:04 +01:00
pem@mysql.com
5cf8418b10 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug14834/mysql-5.0
 2006-01-18 17:09:23 +01:00
aivanov@mysql.com
5f7279d0d5 Applied patch recieved from Marko: 
Make innodb_thread_concurrency 0 by default, and extend the usable
 range from 0 to 1000 (0 disables the thread throttling).
 2006-01-18 15:20:56 +03:00
bell@sanja.is.com.ua
e87d5e9a83 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug8-4.1
 2006-01-18 13:49:37 +02:00
bell@sanja.is.com.ua
4e931d3c45 Excluded posibility of tmp_table_param.copy_field double deletion (BUG#14851). 2006-01-18 13:48:57 +02:00
msvensson@neptunus.(none)
e55af5271c Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-17 19:46:02 +01:00
konstantin@mysql.com
8d6c98ed90 Bug#15206: "Misleading message "No data to FETCH": 
reword the misleading message.
 2006-01-17 21:10:47 +03:00
msvensson@neptunus.(none)
f729ad7d39 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-17 19:08:07 +01:00
msvensson@neptunus.(none)
8b243b3799 Fix for connection not being added to connection pool if "disable_abort_on_error" was used. 2006-01-17 19:02:42 +01:00
pem@mysql.com
7817b99857 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug15231/mysql-5.0
 2006-01-17 12:44:51 +01:00
pem@mysql.com
2f44b60752 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0
 2006-01-17 10:04:11 +01:00
konstantin@mysql.com
4fd615abdb A post-merge fix. 2006-01-17 01:22:01 +03:00
konstantin@mysql.com
c05b3f3bb1 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-01-17 01:18:00 +03:00
konstantin@mysql.com
739ba76d64 A fix for Bug#13337 "ps test fails if configure wo/ usc2" 2006-01-17 01:03:03 +03:00
konstantin@mysql.com
34c37d1ac9 Merge mysql.com:/opt/local/work/mysql-4.1-root 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-01-17 00:44:43 +03:00
konstantin@mysql.com
3d16758311 A test case for Bug#6073 "ALTER TABLE minor glitch" (can't repeat) 2006-01-17 00:28:00 +03:00
konstantin@mysql.com
f693473fff A test case for Bug#7670 "Loss of precision for some integer 
values stored into DOUBLE column" (Can't repeat)
 2006-01-16 22:31:13 +03:00
pem@mysql.com
5863337b8f Post-merge fixes (BUG#14498) 2006-01-16 17:55:22 +01:00
andrey@lmy004.
7b2238d484 Merge 2006-01-16 16:21:41 +01:00
knielsen@mysql.com
638aef7fa5 Merge mysql.com:/usr/local/mysql/mysql-5.x-win-test-fixes 
into  mysql.com:/usr/local/mysql/mysql-5.0-win-test-fixes
 2006-01-16 15:48:55 +01:00
gvb@phoenix.(none)
8c69d6abaf date_formats.test: 
fix for bug #15828 after review
  doing val_str now before testing of null value secures the function for null values returned by dynamic functions - the fix before was incomplete andy covered constant null values
 2006-01-16 15:46:37 +01:00
pem@mysql.com
559a243686 Merge mysql.com:/extern/mysql/bk/mysql-5.0 
into  mysql.com:/extern/mysql/work/bug14498/mysql-5.0
 2006-01-16 15:37:25 +01:00
knielsen@mysql.com
1b75cf8aa6 Two minor fixes to be able to run tests from within a Windows Max 
build directory.
 2006-01-16 15:25:15 +01:00
aivanov@mysql.com
708f9b3ceb Changes from the innodb-5.0-ss115 snapshot. 
Fixed bugs:
 BUG#15991: "innodb-file-per-table + symlink database + rename = crash"
 BUG#15650: "DELETE with LEFT JOIN crashes server"
 BUG#15308: "Problem of Order with Enum Column in Primary Key"
 BUG#14189: "VARBINARY and BINARY variables: trailing space ignored"
 2006-01-16 14:32:43 +03:00
aivanov@mysql.com
c46f11fa96 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/alexi/innodb-ss/mysql-4.1-ss14
 2006-01-15 14:56:38 +03:00
aivanov@mysql.com
ee2b765751 Changes from innodb-4.1-ss14 snapshot 
Fixed BUG#14056: Column prefix index on UTF-8 primary key
 causes "Can't find record.."
 Also fixed bug 15991.
 2006-01-15 14:50:47 +03:00
konstantin@mysql.com
750f9fee90 A post-merge fix (Bug#12734) 2006-01-14 21:20:42 +03:00
konstantin@mysql.com
0a64381cee Merge mysql.com:/opt/local/work/mysql-4.1-12734 
into  mysql.com:/opt/local/work/mysql-5.0-root
 2006-01-14 19:12:07 +03:00
konstantin@mysql.com
48d48bc936 A fix and a test case for Bug#12734 " prepared statement may 
return incorrect result set for a select SQL request"
 2006-01-14 04:55:07 +03:00
sergefp@mysql.com
86daf2d493 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug16393-r2
 2006-01-14 01:28:42 +03:00
sergefp@mysql.com
e58314d482 BUG#16393: Let the 'ref' optimizer use ON condition of nested join to construct 
'ref' accesses to all tables that are direct children of the nested join and are 
not inner wrt their siblings.
 2006-01-13 23:55:30 +03:00
svoj@april.(none)
d0a5e3db9f Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.0
 2006-01-13 21:30:05 +04:00
svoj@april.(none)
5581ef960a BUG#13835: max key length is 1000 bytes when trying to create a fulltext index 
Allow fulltext index on VARCHAR columns longer than max key length.
 2006-01-13 21:25:12 +04:00
evgen@moonbone.local
ceb1932984 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/15347-bug-5.0-mysql
 2006-01-13 18:42:15 +03:00
gvb@phoenix.(none)
45db1c24b0 fix for bug#15828 
problem was not checking 2nd parameter of str_to_date against NULL
 2006-01-13 14:42:46 +01:00
evgen@moonbone.local
cea01c7387 Merge 2006-01-13 16:27:38 +03:00
bar@mysql.com
0e2fac2d8c Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-13 17:21:38 +04:00
bar@mysql.com
949aced164 Merge mysql.com:/usr/home/bar/mysql-4.1.b15377 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-13 16:39:33 +04:00
evgen@moonbone.local
02570c20bf Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/15538-bug-5.0-mysql
 2006-01-13 14:30:20 +03:00
bar@mysql.com
78e93fbbcf Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15377
 2006-01-13 14:22:53 +04:00
bar@mysql.com
b061cacb0b Merge mysql.com:/usr/home/bar/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15377
 2006-01-13 14:16:16 +04:00
evgen@moonbone.local
8dbedc9ffd Merge 2006-01-13 12:13:50 +03:00
jonas@perch.ndb.mysql.com
8c41e2ae2c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-01-13 07:31:35 +01:00
dlenev@mysql.com
f9ea947bdc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg12198-2
 2006-01-13 01:56:57 +03:00
dlenev@mysql.com
d14e701446 Fix for bug #12198 "Temporary table aliasing does not work inside stored 
functions".

We should ignore alias when we check if table was already marked as temporary
when we calculate set of tables to be prelocked. Otherwise we will erroneously
treat tables which are used in same routine and have same name but different
alias as non-temporary.
 2006-01-13 01:51:56 +03:00
msvensson@neptunus.(none)
fac966560a Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-12 18:25:51 +01:00
msvensson@neptunus.(none)
0dffbdfb61 Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-12 18:23:44 +01:00
msvensson@neptunus.(none)
7f919f9ef7 Use "test ! -s" to check that file does not exist 2006-01-12 18:19:57 +01:00
bar@mysql.com
6301568290 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-12 16:07:06 +04:00
bar@mysql.com
832148ded2 ctype_utf8.result: 
After merge fix:
  fixing order of results.
 2006-01-12 13:08:49 +04:00
sergefp@mysql.com
40b7fab55d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/psergey/mysql-5.0-bug16166-r2
 2006-01-12 11:55:34 +03:00
sergefp@mysql.com
e40759e370 BUG#16166, "Can't use index_merge with FORCE INDEX": adjust the heurstics check to take into 
account that "FORCE INDEX" disables full table scans, and not range/index_merge scans.
(with post-review fixes)
 2006-01-12 10:48:27 +03:00
bar@mysql.com
0e9c8395c7 Merge mysql.com:/usr/home/bar/mysql-4.1.b15581 
into  mysql.com:/usr/home/bar/mysql-5.0
 2006-01-12 11:38:09 +04:00
bar@mysql.com
45c84d0aa9 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b15581
 2006-01-12 11:13:34 +04:00
anozdrin@mysql.com
dae00c191f Fix for BUG#15103: SHOW TRIGGERS: small output alignment problem. 2006-01-12 03:02:52 +03:00
evgen@moonbone.local
41ef34356c Fixed bug #15538: unchecked table absence caused server crash. 
Absence of table in left part of LEFT/RIGHT join wasn't checked before
name resolution which resulted in NULL dereferencing and server crash.

Modified rules: 
"table_ref LEFT opt_outer JOIN_SYM table_ref" and "table_ref RIGHT opt_outer 
JOIN_SYM table_ref"
NULL check is moved before push_new_name_resolution_context()
 2006-01-11 23:39:09 +03:00
evgen@moonbone.local
3e23d458f9 Fixed bug #15347: Wrong result of subselect when records cache and set 
functions are involved.

When subselect is a join with set functions and no record have been found in
it, end_send_group() sets null_row for all tables in order aggregate functions 
to calculate their values correctly. Normally this null_row flag is cleared for 
each table in sub_select(), but flush_cached_records() doesn't do so.
Due to this all fields from the table processed by flush_cached_records() are 
always evaluated as nulls and whole select produces wrong result.

flush_cached_records() now clears null_row flag at the very beginning.
 2006-01-11 23:16:21 +03:00
evgen@moonbone.local
605f62fce8 Fixed bug #15633: Evaluation of Item_equal for non-const table caused wrong 
select result

Item equal objects are employed only at the optimize phase. Usually they are not
supposed to be evaluated.  Yet in some cases we call the method val_int() for
them. Here we have to take care of restricting the predicate such an object
represents f1=f2= ...=fn to the projection of known fields fi1=...=fik.

Added a check for field's table being const in Item_equal::val_int().
If the field's table is not const val_int() just skips that field when
evaluating Item_equal.
 2006-01-11 22:49:43 +03:00
pem@mysql.com
0cc1acd51c Fixing BUG#15658: Server crashes after creating function as empty string 
Empty strings (and names with trailing spaces) should not be allowed.
 2006-01-11 15:11:05 +01:00
msvensson@neptunus.(none)
4b913614fc Merge neptunus.(none):/home/msvensson/mysql/wl2930_fixup/my50-wl2930_fixup 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2006-01-11 11:24:57 +01:00
msvensson@neptunus.(none)
2f48e4f1dc Fix problem with strange printout of line numbers, detected on aix52, but existing on all platforms, just being masked by init of vars to zero. 2006-01-11 11:06:26 +01:00
msvensson@neptunus.(none)
d42d399464 Disable code for "let" to assign each column from query to it's own variable 2006-01-11 00:24:57 +01:00
anozdrin@mysql.com
b04b851ef9 Fix for BUG#15110: mysqldump --triggers: does not include DEFINER clause 
There are two main idea of this fix:
  - introduce a common function for server and client to split user value
    (<user name>@<host name>) into user name and host name parts;
  - dump DEFINER clause in correct format in mysqldump.
 2006-01-11 02:07:40 +03:00
aivanov@mysql.com
cdf3e4c02e Post-merge changes 2006-01-10 21:03:02 +03:00
aivanov@mysql.com
2871e85f2e Merge mysql.com:/home/alexi/dev/mysql-4.1-15805 
into  mysql.com:/home/alexi/dev/mysql-5.0-15805
 2006-01-10 19:22:47 +03:00
aivanov@mysql.com
16004acce1 Commenting out testcases which cause type_time.test failure. 
To be uncommented after fixing bug 15805.
 2006-01-10 17:57:46 +03:00
aelkin@mysql.com
9f0b5092e3 Merge aelkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0
 2006-01-10 14:40:05 +02:00
aelkin@mysql.com
d7eb02f439 BUG#9483 test was overworked to account reviews finally to leave only REVOKE check. 
There is a specific rpl_ignore_grant test case for GRANT.
 2006-01-10 13:44:08 +02:00
msvensson@neptunus.(none)
86e8958a4e Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
 2006-01-10 09:57:59 +01:00
igor@rurik.mysql.com
32c7a0b62f Merge rurik.mysql.com:/home/igor/mysql-5.0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-01-09 21:46:33 -08:00
igor@rurik.mysql.com
e4b1399b5a Merge rurik.mysql.com:/home/igor/mysql-4.1 
into  rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2006-01-09 15:20:01 -08:00
msvensson@neptunus.(none)
e0d3410a3e Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
 2006-01-09 20:12:18 +01:00
msvensson@neptunus.(none)
33d5dc041d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
 2006-01-09 17:18:49 +01:00
msvensson@neptunus.(none)
4bcf141799 Bug #15598 Server crashes in specific case during setting new password 
- Comparing host string against NULL caused crash. 
- If host.hostname is NULL treat it as ""
 2006-01-09 17:12:26 +01:00
msvensson@neptunus.(none)
7bda1e9191 Merge neptunus.(none):/home/msvensson/mysql/bug15598/my41-bug15598 
into  neptunus.(none):/home/msvensson/mysql/bug15598/my50-bug15598
 2006-01-09 11:16:29 +01:00
msvensson@devsrv-b.mysql.com
175a946e55 Merge msvensson@10.100.68.5:/home/msvensson/mysql/bug15598/my41-bug15598 
into  devsrv-b.mysql.com:/space/magnus/my41-bug15598
 2006-01-09 10:57:28 +01:00
msvensson@neptunus.(none)
2a05a6ba87 Bug #15598 Server crashes in specific case during setting new password 
- When acl_user->host.hostname is NULL compare it as ""
 2006-01-09 10:31:07 +01:00
igor@rurik.mysql.com
bf78fd5438 Merge rurik.mysql.com:/home/igor/dev/mysql-4.1-0 
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
 2006-01-07 23:10:08 -08:00
igor@rurik.mysql.com
05947d9916 Fixed bug #14274: a query with a having clause containing only set function returned a wrong result set. 2006-01-07 23:00:06 -08:00
igor@rurik.mysql.com
d2cfad167b Fixed bug #16016: MIN/MAX optimization was not applied to views. 2006-01-06 22:28:26 -08:00
jimw@mysql.com
d8a4aafe33 Merge mysql.com:/home/jimw/my/mysql-5.0-14212 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2006-01-06 08:34:55 -08:00
monty@mysql.com
b0a5ea01ef Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/my/mysql-5.0
 2006-01-06 01:08:48 +02:00
monty@mysql.com
6e22e29de6 Review fixes of new pushed code 
- Fixed tests
- Optimized new code
- Fixed some unlikely core dumps
- Better bug fixes for:
  - #14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
  - #14850 (ERROR 1062 when a quering a view using a Group By on a column that can be null
 2006-01-06 00:47:49 +02:00
knielsen@mysql.com
64f7425ac9 Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxfix 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2006-01-04 16:14:49 +01:00
knielsen@mysql.com
f6b1f10707 Fix QNX test abort in release builds and pushbuild, avoid killing our 
parent when we are not the process group leader.
 2006-01-04 16:02:41 +01:00
knielsen@mysql.com
85575904fa BUG#14931: Temporarily add synchronization to avoid sporadic test failures until 
the bug is fixed.
 2006-01-04 15:25:32 +01:00
knielsen@mysql.com
b6faf80f20 Merge mysql.com:/usr/local/mysql/mysql-5.0-qnxtestsock 
into  mysql.com:/usr/local/mysql/mysql-5.0
 2006-01-04 10:34:47 +01:00
knielsen@mysql.com
3524b80092 Avoid double slash (//) in socket paths, breaks on QNX. 2006-01-04 10:32:52 +01:00
gluh@eagle.intranet.mysql.r18.ru
8ce6f3e6ca Fix for bug#15533 crash, information_schema, function, view 
enable view prepared mode during getting metedata for I_S table
 2006-01-03 14:25:19 +04:00
jonas@perch.ndb.mysql.com
8d756c5bdd Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
 2006-01-02 14:49:02 +01:00
jonas@perch.ndb.mysql.com
805655d889 bug#16125 - ndb bitfield of exact 32 bits, incorrect assertion (i.e. only noticable in debug compiled) 2006-01-02 14:38:38 +01:00
ingo@mysql.com
2547cdc7a3 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug15591
 2005-12-29 11:07:27 +01:00
msvensson@neptunus.(none)
43a559ac70 Improved error message for failing with wrong error 2005-12-29 09:48:43 +01:00
msvensson@neptunus.(none)
6de9519966 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2
 2005-12-29 09:19:25 +01:00
ingo@mysql.com
b1214d232e Bug#15591 Occasional test suite abort due to port in use 
If the server is started with --port-open-timeout=# 
retry to bind the TCP port if it fails with EADDRINUSE.
Use the new option in mysql-test-run.sh.
 2005-12-28 20:30:57 +01:00
msvensson@devsrv-b.mysql.com
45864dbf4b Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2 
into  devsrv-b.mysql.com:/space/magnus/my50-bug15775_part2
 2005-12-28 17:37:28 +01:00
evgen@moonbone.local
45abf0dabd Manual merge 2005-12-28 17:23:08 +03:00
msvensson@neptunus.(none)
e1ef24e38c Bug #15775 "drop user" command does not refresh acl_check_hosts 
- Update patch for 5.0 
 - Added common function to be called when 'acl_users' has been modified
 2005-12-28 14:43:50 +01:00
evgen@moonbone.local
535b23bec5 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/14583-bug-4.1-mysql
 2005-12-28 16:00:10 +03:00
msvensson@neptunus.(none)
cdd1f5c6fc Merge neptunus.(none):/home/msvensson/mysql/bug15775_part2/my41-bug15775_part2 
into  neptunus.(none):/home/msvensson/mysql/bug15775_part2/my50-bug15775_part2
 2005-12-28 09:31:40 +01:00
msvensson@neptunus.(none)
2fb6cb5a5a BUG#15775 "drop user" command does not refresh acl_check_hosts 
- DROP USER command didn't reload the acl_check_hosts cache causing subsequent 
     connect's via TCP to fail randomly.
   - 4.1 version
 2005-12-28 09:23:27 +01:00
ingo@mysql.com
bd1b724bbf Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2005-12-27 19:25:54 +01:00
evgen@moonbone.local
d91cbf34ff Fix bug#14583 
When InnoDB compares varchar field in ucs2 with given key using bin collation,
it calls my_strnncollsp_ucs2_bin() to perform comparison.
Because field length was lesser than length of key field should be padded
with trailing spaces in order to get correct result. 
Because  my_strnncollsp_ucs2_bin() was calling my_strnncollp_ucs2_bin(), which
doesn't pads field, wrong comparison result was returned. This results in
wrong result set.

my_strnncollsp_ucs2_bin() now compares fields like my_strnncollsp_ucs2 do,
but using binary collation.
 2005-12-27 20:16:59 +03:00
stewart@mysql.com
efbdf7b225 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main 
into  mysql.com:/home/stewart/Documents/MySQL/5.0/main
 2005-12-28 00:57:18 +11:00
ingo@mysql.com
44ef4989bb Merge mysql.com:/home/mydev/mysql-4.1 
into  mysql.com:/home/mydev/mysql-4.1-bug5390
 2005-12-27 10:36:19 +01:00
ingo@mysql.com
ef52a59418 Merge mysql.com:/home/mydev/mysql-5.0 
into  mysql.com:/home/mydev/mysql-5.0-bug5390
 2005-12-27 10:31:00 +01:00
bar@mysql.com
7f843ffe87 ctype_uca.result, ctype_uca.test: 
Adding test case.
charset-def.c:
  Initialize new collation.
ctype-uca.c:
  Adding simplified Hungarian collation.
 2005-12-23 14:20:00 +04:00
dlenev@mysql.com
74ca27b305 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-bg14836
 2005-12-21 15:02:34 +03:00
ingo@mysql.com
b0e84cb999 BUG#5390 - problems with merge tables 
Problem #1: INSERT...SELECT, Version for 5.0.
Extended the unique table check by a check of lock data.
Merge sub-tables cannot be detected by doing name checks only.
 2005-12-20 16:35:05 +01:00
msvensson@neptunus.(none)
90bbcc9b4d Store the each column from a multi column result set into a separate variable. 2005-12-20 15:34:58 +01:00
gluh@eagle.intranet.mysql.r18.ru
f9ef0df0d3 Fix for bug#14271 I_S: columns has no size for (var)binary columns 
set character_octet_length, character_maximum_length for
  binary and varbinary field types
 2005-12-19 16:21:02 +04:00
bar@mysql.com
f206a123a1 Bug#15581: COALESCE function truncates mutli-byte TINYTEXT values 
field.cc:
  BLOB variations have number-in-bytes limit,
  unlike CHAR/VARCHAR which have number-of-characters limits.
  A tinyblob column can store up to 255 bytes.
  In the case of basic Latin letters (which use 1 byte per character)
  we can store up to 255 characters in a tinyblob column.
  When passing an utf8 tinyblob column as an argument into
  a function (e.g. COALESCE) we need to reserve 3*255 bytes.
  I.e. multiply length in bytes to mbcharlen for the character set.
  Although in reality a tinyblob column can never be 3*255 bytes long,
  we need to set max_length to multiply to make fix_length_and_dec()
  of the function-caller (e.g. COALESCE) calculate the correct max_length
  for the column being created.

ctype_utf8.result, ctype_utf8.test:
  Adding test case.
 2005-12-19 15:52:10 +04:00
gluh@eagle.intranet.mysql.r18.ru
f4b052844f Fix for bug#14861 aliased column names are not preserved. 
Create tmp table filed using original item name when it's necessary
 2005-12-19 15:36:03 +04:00
gluh@eagle.intranet.mysql.r18.ru
c8631b414b 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.
 2005-12-19 14:46:54 +04:00
holyfoot@deer.(none)
6a8f762ecd bug #15429 (Test 'func_math' not prepared for 'classic' build) 2005-12-19 14:21:42 +04:00
kent@mysql.com
f2b1e40383 mysql-test-run.pl: 
Script "my_print_defaults" is to be searched for as executable
 2005-12-19 03:39:25 +01:00
serg@serg.mylan
f4d3a85aaa 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
kent@mysql.com
63b4ce720a Merge 2005-12-18 15:26:37 +01:00
serg@serg.mylan
c23612247c 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
serg@serg.mylan
297d80dc11 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