mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
14234 commits 2784 branches 343 tags 1.6 GiB
Commit graph

3095 commits

Author SHA1 Message Date
serg@serg.mylan
fc234f2e4c Bug#4261 - mysqldump omits NULLs with --skip-extended-insert 2004-06-23 21:46:17 +02:00
serg@serg.mylan
9f45c9e399 followup to handler cleanup 2004-06-23 21:26:34 +02:00
bell@sanja.is.com.ua
2f5c9b7aa5 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
 2004-06-23 18:58:52 +03:00
monty@mysql.com
580cb3ddee Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-06-23 16:44:54 +03:00
monty@mysql.com
ad86016e2f lower_case_table_names=2 (Keep case for table names) was not honored 
with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
Make net_buffer_length visible for mysql clients (Bug #4206)
 2004-06-23 16:44:34 +03:00
mskold@mysql.com
432020a18d Modified ndbcluster_print_error to stack allocate table and handler, NOT for review, will make patch instead 2004-06-23 15:34:45 +02:00
serg@serg.mylan
c03addab79 merged 2004-06-23 12:36:07 +02:00
serg@serg.mylan
3f1c4ba745 handler interface cleanups: 
more logical table/index_flags
  return  HA_ERR_WRONG_COMMAND instead of abstract methods where appropriate
  max_keys and other limits renamed to max_supported_keys/etc
  max_keys/etc are now wrappers to max_supported_keys/etc 
  ha_index_init/ha_rnd_init/ha_index_end/ha_rnd_end are now wrappers to real {index,rnd}_{init,end} to enforce strict pairing
 2004-06-23 12:29:05 +02:00
sergefp@mysql.com
9c2a961a63 Fix and test case for BUG#3899 2004-06-23 11:40:42 +04:00
pem@mysql.com
97caae5109 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/pem/work/mysql-4.1
 2004-06-23 09:07:14 +02:00
pem@mysql.comhem.se
34ddd9c515 Fixed BUG#3486: FOUND_ROWS() fails inside stored procedure [and prepared statement]. 2004-06-22 19:38:07 +02:00
dlenev@brandersnatch.localdomain
b20dca925d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4200
 2004-06-22 19:28:01 +04:00
ingo@mysql.com
e1cd282ea2 bug#2688 - Wrong index_merge query results for BDB table with variable length primary key. 
dded code to clear the tail of the reference buffer if the actual key length 
is less than the maximum key length.
 2004-06-22 17:27:57 +02:00
dlenev@brandersnatch.localdomain
eea19e5235 Fix for Bug# 4200 "Parse error on LIKE ESCAPE with parameter binding" 
Now ESCAPE in LIKE will accept not only string literal but constant 
delimited expression.
 2004-06-22 19:27:16 +04:00
bell@sanja.is.com.ua
e71b693115 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-regexp-4.1
 2004-06-22 15:17:40 +03:00
bell@sanja.is.com.ua
5ed07df98a Merge 2004-06-22 13:48:51 +03:00
bell@sanja.is.com.ua
c6cd51798b post-review changes (Bug#4090) 2004-06-22 13:41:57 +03:00
bell@sanja.is.com.ua
fe3f6f4c36 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
 2004-06-22 13:22:00 +03:00
ram@gw.mysql.r18.ru
f3d11147c9 after merge fix 2004-06-22 14:48:29 +05:00
bell@sanja.is.com.ua
cb0f607c5e Merge 2004-06-22 12:38:23 +03:00
bar@mysql.com
51e08a7c49 auto_increment.test, auto_increment.result: 
Drop t2 in the beginning.
  ,
 2004-06-22 14:10:50 +05:00
ram@gw.mysql.r18.ru
b929db876d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4198
 2004-06-22 10:58:16 +05:00
serg@sergbook.mysql.com
6adefe41a4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
 2004-06-21 19:44:20 +03:00
serg@sergbook.mysql.com
e2a3ca8637 use ref not range for ... WHERE key IN (val) 2004-06-21 19:42:00 +03:00
ram@gw.mysql.r18.ru
d337899571 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.bnew
 2004-06-21 16:53:58 +05:00
ram@gw.mysql.r18.ru
df727fbb65 a fix (bug #4198: Incorrect key file for table). 2004-06-21 15:17:07 +05:00
ram@gw.mysql.r18.ru
1d3118f1d2 proper test of warnings for group_concat(). 2004-06-21 14:11:51 +05:00
monty@mysql.com
030f091319 Field_geom should have same max_length as Field_blob 
Updated tests
After merge fix
 2004-06-21 11:27:40 +03:00
monty@mysql.com
d69a36d118 merge 2004-06-21 10:24:40 +03:00
monty@mysql.com
1388c164bc After merge fixes 
Return NULL if a time argument is given to date_add(). (Warning will be shown after Dimitri's timezone patch is pushed)
 2004-06-21 10:21:20 +03:00
bell@sanja.is.com.ua
2a3d5308df do not clear list of changed tables on one statement rollback (Bug #4213) 2004-06-20 23:44:21 +03:00
guilhem@mysql.com
f5d6424487 Robustness feature. 
Won't be pushed as is - separate email sent for internal review.
WL#1717 "binlog-innodb consistency".
Now when mysqld starts, if InnoDB does a crash recovery, we use the binlog name
and position retrieved from InnoDB (corresponding to the last transaction
successfully committed by InnoDB) to cut any rolled back transaction from
the binary log. This is triggered by the --innodb-safe-binlog option.
Provided you configure mysqld to fsync() InnoDB at every commit (using
flush_log_at_trx_commit) and to fsync() the binlog at every write
(using --sync-binlog=1), this behaviour guarantees that a master always has
consistency between binlog and InnoDB, whenever the crash happens.
6 tests to verify that it works.
 2004-06-20 19:11:02 +02:00
bell@sanja.is.com.ua
a19b0f0a8e cleanup for Item_func_regex (Bug #4199) 2004-06-19 13:26:39 +03:00
dlenev@brandersnatch.localdomain
e8891ee926 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-tz-push
 2004-06-18 10:12:21 +04:00
dlenev@brandersnatch.localdomain
09ba29e539 WL#1264 "Per-thread time zone support infrastructure". 
Added basic per-thread time zone functionality (based on public
domain elsie-code). Now user can select current time zone
(from the list of time zones described in system tables).
All NOW-like functions honor this time zone, values of TIMESTAMP
type are interpreted as values in this time zone, so now
our TIMESTAMP type behaves similar to Oracle's TIMESTAMP WITH
LOCAL TIME ZONE (or proper PostgresSQL type).
  
WL#1266 "CONVERT_TZ() - basic time with time zone conversion 
function".
  
Fixed problems described in Bug #2336 (Different number of warnings 
when inserting bad datetime as string or as number). This required
reworking of datetime realted warning hadling (they now generated 
at Field object level not in conversion functions).
  
Optimization: Now Field class descendants use table->in_use member
instead of current_thd macro.
 2004-06-18 10:11:31 +04:00
monty@mysql.com
b11d258835 Merge with 4.0.21 2004-06-18 04:38:58 +03:00
konstantin@mysql.com
7bbdb8408b Fix for bug#4105 "Server crash on attempt to prepare a statement with 
character set introducer": add new item type to be returned before from 
Item_param until it's value is set.
This way items like Item_bool_func2 and udf_handler won't treat this item
as constant literal when statement is prepared.
 2004-06-18 04:16:08 +04:00
monty@mysql.com
fd0153304d Fixed some byte order bugs with prepared statements on machines with high-byte-first. (Bug #4173) 
Fixed problem with NULL and derived tables (Bug #4097)
Cleanup of new pushed code
 2004-06-18 03:02:29 +03:00
monty@mysql.com
7a046496ba Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-06-18 02:31:36 +03:00
monty@mysql.com
fd6858dccd Fixed unlikely bug in the range optimzer when using many IN() queries on different key parts. (Bug #4157) 2004-06-18 02:31:11 +03:00
bell@sanja.is.com.ua
523dbb3ef9 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-06-17 12:03:00 +03:00
ram@gw.mysql.r18.ru
5790b17ecb a test case (Bug #4102 Crash with a DBUG window after a request) 2004-06-17 12:47:58 +05:00
bell@sanja.is.com.ua
002364c20f new length detection for non-string in UNION (BUG#4067) 2004-06-16 16:06:30 +03:00
paul@kite-hub.kitebird.com
125b4da804 packet.result, alter_table.result: 
fix up test result.
 2004-06-15 23:50:03 -05:00
paul@ice.snake.net
fd1d01e098 Language/consistency edits to error messages 
and affected test results.
 2004-06-15 22:18:20 -05:00
paul@kite-hub.kitebird.com
f4dbb250fd Language/consistency edits to error messages 
and affected test results.
 2004-06-15 15:38:36 -05:00
ram@gw.mysql.r18.ru
5647996784 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4035
 2004-06-15 16:03:16 +05:00
bar@mysql.com
6342e06cb2 utf8 contraction fix. 
Polish collation fix.
Slovak collation fix.
Testing all language orders.
 2004-06-14 21:55:36 +05:00
bell@sanja.is.com.ua
d2c585df31 fixed field resolving mode fo INSERT/REPLACE and CRETE with SELECT (BUG#4090) 2004-06-13 22:39:09 +03:00
serg@serg.mylan
035e03c1f6 merged 2004-06-11 20:55:08 +02:00
bell@sanja.is.com.ua
0b8d7d8371 test suite for bug Bug#3969 (commited separetely because it took too long time to parse it on 3.23) 2004-06-11 16:25:18 +03:00
serg@serg.mylan
78fa465b92 bug#3964 and related issues: FTB problems with charsets where one byte can match many 
correct prefix compare with my_strnncoll
 2004-06-10 21:18:57 +02:00
bell@sanja.is.com.ua
be642b9bcd EXISTS(SELECT * ...) 
close table before opening in optimize
 2004-06-10 21:33:15 +03:00
monty@mysql.com
d28895d042 After merge fix 2004-06-10 16:44:39 +03:00
monty@mysql.com
ff223db0fe Merge with 3.23 to get latest bug fixes 2004-06-10 11:59:45 +03:00
bell@sanja.is.com.ua
ba82b9e7d5 cleunup() of count() and max()/min() added (BUG#2687) 2004-06-10 10:59:55 +03:00
bell@sanja.is.com.ua
98a7b49dc5 do not unlock tables early if we have subquery in HAVING clause (BUG#3984) 2004-06-09 23:32:20 +03:00
guilhem@mysql.com
2b20e84ff8 Making DROP TABLE IF EXISTS, DROP DATABASE IF EXISTS, DELETE FROM, UPDATE be logged to 
binlog even if they changed nothing, and a test for this.
This is useful when users use these commands to clean up their master and slave by issuing
one command on master (assume master and slave have slightly different data for some
reason and you want to clean up both).
Note that I have not changed multi-table DELETE and multi-table UPDATE because their
error-reporting mechanism is more complicated.
 2004-06-09 16:07:01 +02:00
serg@serg.mylan
a8a8da3920 different (simpler and more compatible) fix for bug#4046 2004-06-09 00:08:24 +02:00
guilhem@mysql.com
b514e6a8c5 Correction to replication of charsets in 4.1: 
In mysqlbinlog, there was a problem with how we escaped the content of a string user variable.
To be perfect, we should have escaped with character_set_client. But this charset is unknown
to mysqlbinlog. So the simplest is to print the string in hex. This is unreadable but
100% safe with any charset (checked with Bar), no more need to bother with character_set_client.
 2004-06-08 19:55:04 +02:00
ram@gw.mysql.r18.ru
71eee450e0 a fix 
(Bug #4035 GROUP_CONCAT with HAVING clause truncates field                       
Bug #4057 LEFT() function in HAVING clause truncates query result).
 2004-06-08 18:01:15 +05:00
bar@bar.intranet.mysql.r18.ru
500874b554 Bug #3717 ENCODE returns a character string, not a binary string 2004-06-08 15:36:44 +05:00
bar@bar.intranet.mysql.r18.ru
7d33346854 Bug #2077 Japanese characters in enum/default values are reported incorrectly 2004-06-08 14:26:16 +05:00
bar@bar.intranet.mysql.r18.ru
d04966e380 Sorry, forgot to commit together with the code change yesterday. 2004-06-08 11:33:16 +05:00
sergefp@mysql.com
7e0455f333 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-06-07 23:50:59 +04:00
guilhem@mysql.com
3786538112 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-874
 2004-06-07 18:56:33 +02:00
guilhem@mysql.com
7108e4b017 updating test's result now that SHOW BINLOG EVENTS quotes and escapes user variables. 2004-06-07 18:55:53 +02:00
gluh@gluh.mysql.r18.ru
5725831c73 Fix for bug #4036 multiple SELECT DATE_FORMAT, incorrect results 2004-06-07 20:35:05 +04:00
gluh@gluh.mysql.r18.ru
147c2988cc Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/MySQL-BUGS/mysql-4.1
 2004-06-07 19:58:34 +04:00
gluh@gluh.mysql.r18.ru
d381736c31 Fix for bug#3946: Error in LPAD() when padstring is longer than 1 character 2004-06-07 17:39:17 +04:00
serg@serg.mylan
86e9dc29b0 BUG#3987 - if(int, aggregate(int)) 2004-06-07 12:38:35 +02:00
brian@brian-akers-computer.local
f50066bdb9 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-06-07 02:08:36 -07:00
sergefp@mysql.com
916579e3fd Merged 2004-06-07 12:21:26 +04:00
sergefp@mysql.com
1e05e6cb82 Post review fixes for "SQL Syntax for Prepared Statements". 2004-06-07 12:09:10 +04:00
bar@bar.intranet.mysql.r18.ru
b30b1ccc6a Bug #3928 regexp [[:>:]] and UTF-8 2004-06-07 12:51:18 +05:00
brian@brian-akers-computer.local
e24e1350a3 Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-06-05 10:43:22 -07:00
sergefp@mysql.com
bec20d1fd7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-06-04 05:37:14 +04:00
guilhem@mysql.com
da835a0a06 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2004-06-03 23:19:01 +02:00
guilhem@mysql.com
86e8ecc965 Implementation of WL#1824 "Add replication of character set variables in 4.1", 
by binlogging some SET ONE_SHOT CHARACTER_SETetc,
which will be enough until we have it more compact and more complete in 5.0. With the present patch,
replication will work ok between 4.1.3 master and slaves, as long as:
- master and slave have the same GLOBAL.COLLATION_SERVER
- COLLATION_DATABASE and CHARACTER_SET_DATABASE are not used
- application does not use the fact that table is created with charset of the USEd db (BUG#2326).
all of which are not too hard to fulfill. 
ONE_SHOT is reserved for internal use of mysqlbinlog|mysql and works only for charsets,
so we give error if used for non-charset vars.
Fix for BUG#3875 "mysqlbinlog produces wrong ouput  if query uses
 variables containing quotes" and BUG#3943 "Queries with non-ASCII literals are not replicated
 properly after SET NAMES".
Detecting that master and slave have different global charsets or server ids.
 2004-06-03 23:17:18 +02:00
sergefp@mysql.com
bd04f52552 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-06-03 20:54:46 +04:00
hf@deer.(none)
b8cf9f6afe Merging 2004-06-02 19:17:35 +05:00
hf@deer.(none)
7cf1d2596b wl 1562 (To improve RTree indexes) 
some changes to make code nicer
 2004-06-02 19:11:57 +05:00
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +03:00
monty@mysql.com
53d05f4adb Removed compiler warnings 2004-06-01 23:39:39 +03:00
hf@deer.(none)
39f69a2126 Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.ftr
 2004-06-01 22:37:39 +05:00
sergefp@mysql.com
dc38512390 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-06-01 17:29:13 +04:00
bell@sanja.is.com.ua
9f51e30054 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
 2004-05-28 21:34:09 +03:00
bell@sanja.is.com.ua
266dd53da2 if exists should not be used inside test 
removed influence of some tests on other tests
 2004-05-28 21:31:51 +03:00
ram@gw.mysql.r18.ru
8297e4b4a0 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3738
 2004-05-28 16:38:06 +05:00
ram@gw.mysql.r18.ru
605962a938 a fix. 
(Bug#3738: SQL_CALC_FOUND_ROWS ignores WHERE if LIMIT used,
 Bug#3845: wrong FOUND_ROWS result)
 2004-05-28 15:01:16 +05:00
monty@mysql.com
ccc4171276 Portability fix (using 'char' as argument to C functions may give warnings) 2004-05-28 02:36:43 +03:00
monty@mysql.com
be7f1a3570 merge with 4.0 to get fix for hpux 2004-05-28 02:04:07 +03:00
monty@mysql.com
a7c17eee46 Portability fix for 32 bit file systems 2004-05-28 00:32:55 +03:00
serg@serg.mylan
1998dd786e backport bug#2708 fix from 4.1 2004-05-27 21:14:59 +02:00
hf@deer.(none)
15ea09b79d WL#1163 (Make spatial code separable for other parts) 
--with-geometry and
--with-embedded-privilege-control
configure switches added
 2004-05-27 20:31:30 +05:00
magnus@neptunus.(none)
c5d388f150 Small fix, addin order by to get predicatble output from select 2004-05-26 14:34:40 +02:00
magnus@neptunus.(none)
2daebc70cc Fix after running on a 4-node system. 2004-05-26 14:22:49 +02:00
brian@brian-akers-computer.local
fee4ed7f1c Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1 
into brian-akers-computer.local:/Users/brian/mysql/mysql-4.1
 2004-05-25 14:53:55 -07:00
brian@avenger.(none)
72e7d69674 Added tests for archive. Cleaned up a merge mistake and added some information on how well archive compresses. 2004-05-25 13:27:01 -07:00
magnus@neptunus.(none)
28c8ac884b Corrected index_flags returned when index are created with USING HASH 
Updated ndb_ test cases
 2004-05-25 14:40:51 +02:00
magnus@neptunus.(none)
2bee88a4c2 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-25 12:25:22 +02:00
sergefp@mysql.com
ef260fa754 Merge 2004-05-24 21:13:38 +04:00
sergefp@mysql.com
b142c8edd0 Added replication tests 2004-05-24 21:12:05 +04:00
monty@mysql.com
eca917b79c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-24 15:00:12 +03:00
monty@mysql.com
56c0258536 After merge fixes 
Remove compiler warnings
Update windows project files
 2004-05-24 14:42:34 +03:00
dlenev@brandersnatch.localdomain
8966ff8e73 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bcut
 2004-05-21 20:55:09 +04:00
sergefp@mysql.com
f75b1adece Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-05-21 04:31:07 +04:00
sergefp@mysql.com
fb17025b3e WL#1622 "SQL Syntax for Prepared Statements": Post-review fixes (1 of 2) 2004-05-21 04:27:50 +04:00
ram@gw.mysql.r18.ru
98c10ced6a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b3728
 2004-05-20 14:22:49 +05:00
monty@mysql.com
a4b0ec1ede Merge with 4.0, mainly to get changes to windows project files 2004-05-20 00:54:52 +03:00
sergefp@mysql.com
8e2ff7d135 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/dbdata/psergey/mysql-4.0-root
 2004-05-19 23:20:42 +04:00
bell@sanja.is.com.ua
bd010b1ec3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
 2004-05-19 17:09:40 +03:00
bell@sanja.is.com.ua
d42d709171 after review changes 2004-05-19 17:07:28 +03:00
dlenev@brandersnatch.localdomain
067b2e3bb0 Moved testing of binlog_cache_use/binlog_cache_disk_use statistical variables from 
rpl_relayrotate.test to innodb.test since this test requires innodb support.
 2004-05-19 17:43:50 +04:00
konstantin@mysql.com
e13e9288c9 Fix for Bug#3754 "SET GLOBAL myisam_max_sort_file_size doesn't 
work as expected": precision-losing conversion removed from 
sys_var_thd_ulonglong.
 2004-05-19 16:42:29 +04:00
monty@mysql.com
332f124bc6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-19 05:09:41 +03:00
monty@mysql.com
21f1bca789 Portability fixes 
Fixed wrong number of warnings/duplicates for machines with high-byte-first
 2004-05-19 05:09:10 +03:00
sergefp@mysql.com
482058befa Fix and test case for BUG#3649. 2004-05-18 22:59:43 +04:00
ram@gw.mysql.r18.ru
fdc0f0e781 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b3756
 2004-05-18 13:56:40 +05:00
ram@gw.mysql.r18.ru
0f3ab4174e A fix (Bug #3728: Missing warning in 4.1). 2004-05-18 12:16:00 +05:00
serg@serg.mylan
b269d4ad21 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-05-17 11:05:19 +02:00
serg@serg.mylan
bc71d98a03 bug#3681 - order by, distinct, refer to aliased field by name 
check for field_name (not only for name) in find_item_in_list, to be compatible with item->eq() that is done later
 2004-05-17 11:04:12 +02:00
monty@mysql.com
3f5ce7bd25 After merge fixes 2004-05-17 11:22:30 +03:00
magnus@neptunus.(none)
1f1b01e028 Merge 2004-05-17 09:57:02 +02:00
magnus@neptunus.(none)
de837a0104 Added test(s) for auto discover of frm file 2004-05-17 09:53:13 +02:00
ram@gw.mysql.r18.ru
e166036894 A fix (bug #3756: ISNULL(QUOTE()) returns 1 for every row after 1st NULL) 2004-05-17 12:47:16 +05:00
magnus@neptunus.(none)
4d7edeff8e Updated ndb_basic test 2004-05-17 09:40:35 +02:00
monty@mysql.com
cd3dab49cc Merge with 4.0.20 2004-05-17 01:52:13 +03:00
serg@serg.mylan
0dc8aacf7d merged 2004-05-15 11:26:58 +02:00
serg@serg.mylan
da63a927f2 bad old merge fixed 2004-05-15 11:20:42 +02:00
monty@mysql.com
9f171e7794 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-15 11:58:08 +03:00
monty@mysql.com
e0a4b51215 Better fix for bug #3749 (bug in deleting automatic generated foreign keys) 2004-05-15 11:57:40 +03:00
bell@sanja.is.com.ua
a785d16d8a results fix 2004-05-15 11:20:43 +03:00
guilhem@mysql.com
a039062ef3 Replication testsuite: making the master-slave synchronization less likely to fail, 
by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
in sync_with_master and sync_slave_with_master.
The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
but may affect 4.x as well, so fixing it here. Note that I am also fixing
5.0 too, with the same exact patch, because I don't want to leave 5.0 broken
until the next 4.0->4.1->5.0 merge.
 2004-05-14 23:08:03 +02:00
sergefp@mysql.com
3711c98b2a Trivial manual merge 2004-05-15 00:06:16 +04:00
bell@sanja.is.com.ua
712d379b5e check of item name presence in find_item_in_list (Bug #3752) 2004-05-14 18:55:24 +03:00
bell@sanja.is.com.ua
bb34b56bfd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-explain-4.1
 2004-05-14 15:29:23 +03:00
bell@sanja.is.com.ua
a9501fd7aa after merge fix 2004-05-14 15:28:59 +03:00
bell@sanja.is.com.ua
3f6857112c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-all_any2-4.1
 2004-05-14 14:45:27 +03:00
serg@serg.mylan
67f1c04ffc better fix for bug#3749 - do not consider already removed keys in key removal process 2004-05-14 12:49:18 +02:00
bell@sanja.is.com.ua
71a374dc13 Merge 2004-05-14 13:33:02 +03:00
bell@sanja.is.com.ua
a71771788e Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2004-05-14 11:11:48 +03:00
bell@sanja.is.com.ua
8f957583f1 fixed flags of printed query 2004-05-14 11:09:57 +03:00
bar@bar.intranet.mysql.r18.ru
6ecea2fa93 Bug #3403 Wrong encoding in EXPLAIN SELECT output 2004-05-14 13:08:22 +05:00
bar@bar.intranet.mysql.r18.ru
2fc1d5c146 Bug #3403 Wrong encoding in SHOW GRANTS, EPLAIN SELECT output 
This change fixes SHOW GRANTS problem, while EXPLAIN will be fixed
in a separate patch.
 2004-05-14 12:16:27 +05:00
bell@sanja.is.com.ua
4c774e0c18 fixed flags of printed query 2004-05-13 23:47:20 +03:00
magnus@neptunus.(none)
581819624f Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-13 13:28:56 +02:00
monty@mysql.com
116f61c656 Don't automaticly generate a new key for a foreign key constraint if there is already a usable key. 
Prefer not automatic keys before automatic keys. If there is two conf
 2004-05-12 00:29:52 +03:00
tsmith@build.mysql.com
6ad9691dc8 Merge build:/home/bk/mysql-4.1 
into build.mysql.com:/users/tsmith/m/41/mysql-4.1
 2004-05-11 14:44:25 +02:00
serg@serg.mylan
6f32682524 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-05-11 12:40:07 +02:00
serg@serg.mylan
423f37b92b out-of-bound array access fixed 2004-05-11 12:39:00 +02:00
serg@serg.mylan
8a03c1b869 bug#3612 - Item_func_div set decimals incorrectly 2004-05-11 12:19:37 +02:00
magnus@neptunus.(none)
62fe381192 Updated ndb_* test cases 
Added two new, ndb_replace and ndb_minmax
 2004-05-11 10:40:48 +02:00
bar@bar.intranet.mysql.r18.ru
f16dac0492 Use Windows code page 1252 instead of real ISO 8859-1 2004-05-11 13:32:01 +05:00
tsmith@build.mysql.com
8746a7dab4 logging_ok: 
Logging to logging@openlogging.org accepted
item_cmpfunc.cc, ctype_recoding.test, ctype_recoding.result:
  Call Item_func_conv_charset::fix_fields() in Item_bool_func2::fix_length_and_dec() (but #3704)
 2004-05-10 23:19:50 +02:00
magnus@neptunus.(none)
beff6a44c7 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-10 15:09:19 +02:00
magnus@neptunus.(none)
787c978673 Merged ha_ndbcluster.cc 2004-05-10 15:06:07 +02:00
magnus@neptunus.(none)
794b3b52d9 Updated ndb_basic 2004-05-10 14:14:14 +02:00
serg@serg.mylan
c50e85bd7c Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2004-05-10 12:39:31 +02:00
serg@serg.mylan
2cbc4e71fc backport from 4.1: 
"phrase search" should not match partial words (it should not match 'paraphrase searches')
 2004-05-10 12:39:01 +02:00
bell@sanja.is.com.ua
d2fa79b291 keep old engine & JOIN if we changed subquery Item (Bug #3646) 2004-05-07 23:06:11 +03:00
magnus@neptunus.(none)
97ffc1f408 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-07 16:21:54 +02:00
marko@hundin.mysql.fi
11f9ec1dc5 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-05-07 12:48:01 +03:00
marko@hundin.mysql.fi
c066b3022e Fix auto_inc locking bug introduced in ChangeSet@1.1794.1.1 2004-05-07 12:13:45 +03:00
sergefp@mysql.com
7af3097e60 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-05-07 03:33:39 +04:00
sergefp@mysql.com
7084c77651 Added a test for a problem that was fixed by automerge and fixed a typo. 2004-05-07 03:32:51 +04:00
monty@mysql.com
939ea71ecd Portability fixes 
Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)
 2004-05-07 01:43:17 +03:00
sergefp@mysql.com
67ad78cb5d Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-05-06 23:02:32 +04:00
bell@sanja.is.com.ua
3aae50e8c0 EXPLAIN UNION using same routing which used for execution which allow return correct bug messages (Bug #3639) 
EXPLAIN of hidden SELECT of UNION
 2004-05-06 20:40:21 +03:00
monty@mysql.com
28673669a4 Merge with 4.0 to get security patch for check_grant_colum 2004-05-06 13:42:26 +03:00
marko@hundin.mysql.fi
007e6210d4 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-05-06 09:53:50 +03:00
monty@mysql.com
f6dc9169e2 Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666) 
The bug was introduced in a patch in the 4.1.2 source tree.
 2004-05-06 04:40:45 +03:00
bell@sanja.is.com.ua
5030d28035 fixed test results 2004-05-05 23:29:35 +03:00
bell@sanja.is.com.ua
ae85306e19 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
 2004-05-05 23:19:13 +03:00
guilhem@mysql.com
cd18476e34 Replication: 
as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).
 2004-05-05 22:01:41 +02:00
guilhem@mysql.com
f7f7e725d6 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-05-05 21:51:26 +02:00
guilhem@mysql.com
d20230bcbe very minor changes: a STOP SLAVE in a replication test to get rid of a non critical message in slave.err, 
and a comment update
 2004-05-05 21:50:51 +02:00
bell@sanja.is.com.ua
26f0825cae merge 2004-05-05 22:30:01 +03:00
monty@mysql.com
4e2b94dea6 After merge fixes 2004-05-05 21:46:16 +03:00
monty@mysql.com
6827fe4086 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-05 21:24:45 +03:00
monty@mysql.com
a5d8b846fa after merge fixes 2004-05-05 21:24:21 +03:00
bell@sanja.is.com.ua
62fca61bc4 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1
 2004-05-05 21:24:13 +03:00
bell@sanja.is.com.ua
c5c35c667e caching of queries with isammerge tables forbiden using general way 
SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update
 2004-05-05 21:21:41 +03:00
monty@mysql.com
d21d49a32a Merge with 4.0.19 2004-05-05 17:05:24 +03:00
magnus@neptunus.(none)
1d8bf1cb18 BUG# 3658 ALTER TABLE corrupts table 
Added  test file for ALTER TABLE, engine = ndbcluster
 2004-05-05 16:04:23 +02:00
sergefp@mysql.com
fdfcadc735 Manual merge for WL#1622 code, will need fixes 2004-05-05 16:10:16 +04:00
marko@hundin.mysql.fi
6a6fa5b388 Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-05-05 14:21:42 +03:00
ram@gw.mysql.r18.ru
949c01bfa2 a fix (Bug #3435: STDDEV|VARIANCE(constant) returns constant if no rows) 2004-05-05 16:06:01 +05:00
magnus@neptunus.(none)
6893acc1e8 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-05 12:15:27 +02:00
monty@mysql.com
104fdf607d Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-05 12:40:59 +03:00
monty@mysql.com
7e3cf5958c Fixed crashing bug with alter table when table was in use (Bug #3643) 
We didn't use 'only index' for tables of type 'const'. (Bug #3497)
 2004-05-05 12:31:17 +03:00
bell@sanja.is.com.ua
e9492cca05 avoid using ndb tables in query cache 2004-05-05 11:22:10 +03:00
magnus@neptunus.(none)
347dfcd879 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-05-05 08:55:32 +02:00
Sinisa@sinisa.nasamreza.org
ee627d2510 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2004-05-04 23:05:37 +03:00
Sinisa@sinisa.nasamreza.org
68cb444c62 Fix for a multi table updates when one of the tables is not updated 
but used in a nested query.
 2004-05-04 23:04:05 +03:00
Sinisa@sinisa.nasamreza.org
b58127689e union.result: 
fixing typo
union.test:
  fixing type
 2004-05-04 16:48:34 +03:00
bell@sanja.is.com.ua
5de8c225e2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1
 2004-05-04 15:35:11 +03:00
monty@mysql.com
59ddd8c738 Fix to handle unsigned data in prepared statements (Bug #3447) 
Fixed security problem that password was temporarly reset when someone changed GRANT for a user. (Bug #3404)
Fixed problem with PROCEDURE analyse() and impossible WHERE (Bug #2238)
Don't auto-repair tables in mysqlcheck if table type doesn't support 'check' command.
 2004-05-04 15:02:38 +03:00
Sinisa@sinisa.nasamreza.org
909d69ff0a union.result, union.test: 
a small fix for the test case
 2004-05-04 14:11:23 +03:00
Sinisa@sinisa.nasamreza.org
333eadf1b2 Fix for a bug involving UNION's and SET SQL_SELECT_LIMIT 2004-05-03 19:15:26 +03:00
ingo@mysql.com
5a78b4c746 WL#1700 - Properly count key_blocks_used and key_blocks_current. 
Introduced a new free blocks list. Free blocks are now re-used before
new blocks are allocated from the pool. There is a new status variable 
which can be queried by "show status like key_blocks_unused".
 2004-05-03 15:55:21 +02:00
marko@hundin.mysql.fi
9efb2853ad Merge marko@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/j/mysql-4.1
 2004-05-03 09:45:17 +03:00
bell@sanja.is.com.ua
25d815cde6 fixed zero result case for group functions in subquery (Bug #3505) 
fixed LIMIT 0 for zero rows optimisation
 2004-05-02 13:03:49 +03:00
sergefp@mysql.com
9a4acccd05 WL#1622 "SQL Syntax for Prepared Statements" - cosmetic code review fixes 2004-04-30 20:08:38 +04:00
magnus@neptunus.(none)
d4ee7e7e9b Addded test files for NDB 
Updated stop_ndbcluster script
 2004-04-30 12:49:34 +02:00
magnus@neptunus.(none)
122bff3240 Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/magnus/mysql-4.1
 2004-04-30 12:43:28 +02:00
marko@hundin.mysql.fi
a490b95b04 InnoDB: implement LOCK TABLE (Bug #3299) 2004-04-29 16:42:33 +03:00
magnus@neptunus.(none)
cfbabb0245 Added new mysql-test files for NDB 2004-04-29 09:58:38 +02:00
guilhem@mysql.com
eff7b259e3 Very small fixes for testsuite (a real_sleep instead of sleep, plus TCP port independency of the result file). 2004-04-28 23:43:46 +02:00
guilhem@mysql.com
e7fbd33acc Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-04-28 18:31:31 +02:00
guilhem@mysql.com
3fc39188ec A new option --replicate-same-server-id to force a slave to execute queries originating from itself 
(WL#794). This can be of interest in some recovery-from-backup scenarios, and also when you have
two databases in one mysqld, having a certain similarity and you want one db to be updated when the other is
(some sort of trigger).
Plus small fix for BUG#3568 "MySQL server crashes when built --with-debug and CHANGE MASTER +MASTER_POS_WAIT"
 2004-04-28 18:24:46 +02:00
monty@mysql.com
f61b08a24b Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-04-28 18:38:30 +03:00
antony@ltantony.dsl-verizon.net
9bd11ea8f6 Merge ltantony.dsl-verizon.net:/usr/home/antony/work/mysql-4.0 
into ltantony.dsl-verizon.net:/usr/home/antony/work/bug3481
 2004-04-28 16:38:29 +01:00
sergefp@mysql.com
d4e9522962 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-04-28 19:27:56 +04:00
antony@ltantony.dsl-verizon.net
28870228d4 Fix for Bug 3481 
CREATE statement allowed extra unnecessary commas
 2004-04-28 16:14:53 +01:00
monty@mysql.com
f10d098f7d Fixed http address in some scripts (Bug #3460) 
Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19)) (portability fix)
Fixed that INTERVAL can handle big integers. (Bug #3498)
Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473)
 2004-04-28 17:45:08 +03:00
serg@serg.mylan
2bcfab10ea bug#3556 - soundex 2004-04-28 14:19:02 +02:00
monty@mysql.com
edc584acce Fixed stack overrun with some INSERT ... SELECT ... GROUP BY queries (Bug #3265) 
Ensure that raid_chunks is not set to higher than 255 as this could cause problems with DROP DATABASE. (Bug #3182)
 2004-04-28 03:37:45 +03:00
monty@mishka.local
4999203fbd Fixed results for previous patch 
Ensure that mysqldump doesn't give an error about missing Index.xml when it's not needed
 2004-04-27 17:32:40 +03:00
monty@mishka.local
ef18b13738 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mishka.local:/home/my/mysql-4.1
 2004-04-27 15:48:48 +03:00
monty@mishka.local
e9cfe01db0 After merge fixes 
Changed 'SHOW FIELD STATUS' to use 'Engine' instead of 'Type'
 2004-04-27 15:33:40 +03:00
monty@mishka.local
21fd1d270e Merge with 4.0 2004-04-26 15:53:31 +03:00
marko@hundin.mysql.fi
df5336a3cc Introduce keys in child tables corresponding to FOREIGN KEYs 
Remove redundant keys in CREATE TABLE and ALTER TABLE
 2004-04-21 13:15:43 +03:00
magnus@neptunus.(none)
855fcf1411 Updated mysql-test-run to work with the started NDB Cluster 
Added one test case for ndb to mysql-test-run, ndb_basic. It will show that
NDB Cluster is supported.
 2004-04-15 12:03:13 +02:00
guilhem@mysql.com
5c7d736443 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2004-04-13 22:41:00 +02:00
guilhem@mysql.com
066382e6e7 Fix for BUG#3461 "multi-table DELETE replicated despite replicate-wild-ignore-table": 
In tables_ok(), when there is no table having "updating==TRUE" in the list,
    return that we don't replicate this statement (the slave is supposed to
    replicate *changes* only).
    In practice, the case can only happen for this statement:
    DELETE t FROM t,u WHERE ... ;
    tables_ok(t,u) will now return 0, which (check all_tables_not_ok())
    will give a chance to tables_ok(t) to run.
 2004-04-13 22:40:16 +02:00
sergefp@mysql.com
194027d5d8 Merged 2004-04-13 02:18:09 +04:00
ram@gw.mysql.r18.ru
c8937dbcb7 A fix. (Bug #3376: AVG(constant) returns constant if no rows in result set) 2004-04-09 19:07:39 +05:00
sergefp@mysql.com
eef8fbcf9e Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-04-09 15:15:51 +04:00
bell@sanja.is.com.ua
e8137a13e0 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
 2004-04-09 11:31:06 +03:00
monty@mysql.com
f96c4941d8 Fixed problems noticed with last build 2004-04-09 07:12:41 +03:00
bell@sanja.is.com.ua
555eb86616 merge 2004-04-08 23:50:10 +03:00
sergefp@mysql.com
a298c6d4fa Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
 2004-04-08 19:14:11 +04:00
sergefp@mysql.com
ac563b1b8e Merge 2004-04-08 17:08:56 +04:00
monty@mysql.com
00738a2be0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-08 15:02:25 +03:00
monty@mysql.com
43546e7a82 Moved reading of ranges from opt_range.cc to handler.cc 
This gives the handler more optimization possiblities and is needed for NDB cluster
Fixed not-initialized memory error detected by valgrind
 2004-04-08 13:58:06 +03:00
bell@sanja.is.com.ua
56be6f3f93 merge 2004-04-08 00:19:43 +03:00
bell@sanja.is.com.ua
5e37c41fae new error for unsupported command in PS 
fixed IN subselect with basic constant left expression
SQLCOM_CREATE_TABLE, SQLCOM_UPDATE_MULTI, SQLCOM_REPLACE_SELECT, SQLCOM_INSERT_SELECT, QLCOM_DELETE_MULTI fixed to be compatible with PS (BUG#3398, BUG#3406)
fixed multiupdate privelege check (BUG#3408)
fixed multiupdate tables check (BUG#3411)
unchecked commands now is rejected by PS protocol to avoid serever crash
fixed cleunup procedure to be compatible sith DO/SET (BUG#3393)
 2004-04-08 00:16:17 +03:00
serg@serg.mylan
6ebf869b40 merged 2004-04-07 16:20:46 +02:00
serg@serg.mylan
6fc74e13e7 post-review fixes 
HA_EXTRA_WRITE_CACHE now part of start_bulk_insert()
test cleanups
 2004-04-07 16:04:28 +02:00
bell@sanja.is.com.ua
61fd95d168 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
 2004-04-07 15:23:05 +03:00
vva@eagle.mysql.r18.ru
5fa9953ce3 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_3342/mysql-4.1
 2004-04-07 17:23:04 +05:00
sergefp@mysql.com
ca75b62d5a Correct handling of parameter variables with NULL values in PREPARE queries 2004-04-07 12:58:28 +04:00
monty@mysql.com
70c4eb5838 Portability fixes 
Fixed problems with group_concat() and HAVING
Updated crash-me values
 2004-04-07 04:33:58 +03:00
serg@serg.mylan
e8eda8129f ::reset(), HA_FAST_KEY_READ, disable_indexes(), enable_indexes(), start_bulk_insert(), end_bulk_insert() 
Field::val_str simplification, comment
 2004-04-06 21:35:26 +02:00
monty@mysql.com
472e87a40c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-06 18:30:34 +03:00
vva@eagle.mysql.r18.ru
aeff7ce714 fixed 
bug #3342 "SHOW CREATE DATABASE seems to require DROP privilege"
(now it require only SELECT privilege on database)
 2004-04-06 20:26:35 +05:00
bar@bar.intranet.mysql.r18.ru
950a2ebab1 Fixed charsetnr sent to the client 2004-04-06 19:57:33 +05:00
monty@mysql.com
7ca9a70583 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-06 17:17:15 +03:00
vva@eagle.mysql.r18.ru
0cc998a466 fixed the tests mysql-test/t/synchronization.test 
for Bug #2385 CREATE TABLE LIKE lacks locking on source and destination table
 2004-04-06 19:17:13 +05:00
monty@mysql.com
49330f61da Fixed warnings from valgrind (not a bug) 
Don't add -debug to server version if MYSQL_SERVER_PREFIX is used
Indentation cleanups
 2004-04-06 12:13:43 +03:00
vva@eagle.mysql.r18.ru
7b68b26623 fixed Bug #3361 "mysqldump quotes DECIMAL values" 2004-04-05 23:18:16 +05:00
sergefp@mysql.com
1f8505d66f Post-merge fixes 2004-04-05 19:52:10 +04:00
sergefp@mysql.com
a8386d01c2 Many files: 
SQL Syntax for Prepared Statements (WL#1622)
ps.test, ps.result:
  new file
 2004-04-05 19:43:37 +04:00
gluh@gluh.mysql.r18.ru
03caa47acb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.curr
 2004-04-05 19:14:31 +05:00
monty@mysql.com
0013516951 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-04-05 16:28:16 +03:00
vva@eagle.mysql.r18.ru
611409490a corrected wrong checking of DBUG_OFF in mysql-test/t/synchronization.test 2004-04-05 18:27:19 +05:00
gluh@gluh.mysql.r18.ru
8a4e6c6482 WL1368: SHOW GRANTS FOR CURRENT USER 
'SHOW GRANTS' syntax is added 
  'SHOW GRANTS FOR CURRENT_USER' syntax is added
  'SHOW GRANTS FOR CURRENT_USER()' syntax is added
 CURRENT_USER without parens in expressions(SELECT CURRENT_USER;)
 2004-04-05 17:55:26 +05:00
monty@mysql.com
42cf92ce37 Fixed many compiler warnings 
Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695, #3381 and #3319)
Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
Set locked_in_memory properly
 2004-04-05 13:56:05 +03:00
bell@sanja.is.com.ua
c31f3cf1d2 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-on-4.1
 2004-04-03 11:28:20 +03:00
bell@sanja.is.com.ua
2f4d2a0e38 fixed brocken of client_test 
fixed aggregate functions in PS (BUG#3360)
 2004-04-03 11:13:51 +03:00
vva@eagle.mysql.r18.ru
18b4e9c970 added skipped ``mysql-test/r/synchronization.result'' 2004-04-03 02:50:40 +05:00
vva@eagle.mysql.r18.ru
00d429ac51 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
 2004-04-03 02:47:02 +05:00
vva@eagle.mysql.r18.ru
5f2d73ed96 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2385/mysql-4.1
 2004-04-03 02:46:12 +05:00
vva@eagle.mysql.r18.ru
1198b23a73 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2397/mysql-4.1
 2004-04-03 01:39:45 +05:00
dlenev@jabberwock.localdomain
f6bff2e6c6 WL#1266 "Separate auto-set logic from TIMESTAMP type." 
Final version of patch.

Adds support for specifying of DEFAULT NOW() and/or ON UPDATE NOW()
clauses for TIMESTAMP field definition.
Current implementation allows only one such field per table and
uses several unireg types for storing info about this properties of
field. It should be replaced with better implementation when new
.frm format is introduced.
 2004-04-02 10:12:53 +04:00
dlenev@jabberwock.localdomain
a80f46bfdf WL#775 "Add status variable identifying binlog_cache_size shortage" 
Added two status variables: 
  binlog_cache_use - counts number of transactions that used somehow
    transaction temporary binary log.
  binlog_cache_disk_use - counts number of transactions that required
    disk I/O for storing info in this this binary log.
 2004-04-02 00:47:20 +04:00
vva@eagle.mysql.r18.ru
15cd52c6cb added synchronization in mysql_create_like_table 
(
fixed BUG #2385 CREATE TABLE LIKE lacks locking on source and destination table
and added tests for it
)
 2004-04-01 23:13:25 +05:00
vva@eagle.mysql.r18.ru
7a580ce991 fixed 
BUG #2397 "RENAME TABLES is not blocked by FLUSH TABLES WITH READ LOCK"
(added waiting for global_read_lock in mysql_rename_tables)
 2004-04-01 22:47:09 +05:00
gluh@gluh.mysql.r18.ru
da3308ef57 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/Bugs/mysql-4.1
 2004-03-31 14:30:53 +05:00
gluh@gluh.mysql.r18.ru
daba6b63b8 Fix for bug #2160: Extra error message for CREATE TABLE LIKE with InnoDB 2004-03-31 14:29:01 +05:00
bell@sanja.is.com.ua
99f712a30b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
 2004-03-31 08:24:12 +03:00
monty@mysql.com
ddafa2cc16 simple optimzation 
Portability fixes
 2004-03-31 03:32:38 +03:00
bell@sanja.is.com.ua
e3a619f005 null processing for character_set_results (BUG#3296) 2004-03-30 23:38:56 +03:00
monty@mysql.com
fede76ddf2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-03-30 22:20:40 +03:00
bar@bar.intranet.mysql.r18.ru
eedb8ce92e http://bugs.mysql.com/bug.php?id=3255 
Collation gets lost in CREATE TABLE (...) DEFAULT CHARACTER SET xxx COLLATE yyy

This is fixed now.
Test is added into the test suite.
 2004-03-30 22:38:52 +05:00
bar@bar.intranet.mysql.r18.ru
b92dd45da4 ALTER TABLE t1 CONVERT TO should also change the default character set. 
Forgot to do it in the previous commit.
 2004-03-30 22:18:49 +05:00
bar@bar.intranet.mysql.r18.ru
dba73e1c86 More different syntaxes for (1) modifying the default charaset/collation 
and for (2) converting the columns:

1.  ALTER TABLE t1 [DEFAULT] CHARACTER SET xxx [COLLATE yyy]
2.  ALTER TABLE t1 CONVERT TO CHARACTER SET xxx [COLLATE yyy]
 2004-03-30 21:33:45 +05:00
monty@mysql.com
f602829c75 Fix to get correct metadata when using temporary tables to create result. (Bug #2654) 2004-03-30 19:24:28 +03:00
ram@gw.mysql.r18.ru
3bfbe6e0dd resolving conflicts 2004-03-30 16:04:08 +05:00
monty@mysql.com
4bc6b551f8 false/true -> FALSE/TRUE 
Fixes after last merge
 2004-03-30 02:32:41 +03:00
monty@mysql.com
dc2f606fb8 Merge with 4.0 to get lastest bug fixes 2004-03-29 19:21:53 +03:00
monty@mysql.com
7e161ae070 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-03-29 17:27:25 +03:00
bar@bar.intranet.mysql.r18.ru
928e796e67 Better error messages for not nullable 
SET character_set_xxx=NULL
and
SET collation_xxx=NULL
 2004-03-29 18:33:24 +05:00
bar@bar.intranet.mysql.r18.ru
11f14e0050 Better tests for BINARY 2004-03-29 17:27:30 +05:00
bar@bar.intranet.mysql.r18.ru
f84f6d5cdb Checking Thai sort order and trailing spaces handling 2004-03-29 16:38:38 +05:00
guilhem@mysql.com
19f0843f3f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2004-03-27 01:08:29 +01:00
guilhem@mysql.com
3826a01ee4 A previous changeset by me today about SQL_LOG_BIN had the problem 
that it tested the privilege in ::update() whereas it should be
in ::check() (see email from Serg, subject
"Re: bk commit - 4.1 tree (guilhem:1.1706)").
So I add instead a check_func function to sys_var_thd_bit.
I do the same addition to sys_var_thd_ulong, to unify handling
of PSEUDO_THREAD_ID with the one of SQL_LOG_BIN. So class
sys_var_pseudo_thread_id is not needed anymore, removing it.
 2004-03-27 01:07:09 +01:00
vva@eagle.mysql.r18.ru
8a66c13b34 fixed bug #2342 
"Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"
 2004-03-27 02:29:31 +04:00
vva@eagle.mysql.r18.ru
1eff4744f1 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_2342/mysql-4.0
 2004-03-27 00:41:48 +04:00
vva@eagle.mysql.r18.ru
23d30c397d fixed bug #2342 
"Running ANALYZE TABLE on bdb table inside a transaction hangs server thread"

1. added new status HA_ADMIN_REJECT and processing of it in mysql_admin_table
2. got ha_berkley::analyze to return HA_ADMIN_REJECT if there are any 
 transactions with the table..
 2004-03-27 00:35:45 +04:00
guilhem@mysql.com
380134891d Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2004-03-26 19:29:10 +01:00
guilhem@mysql.com
8066c2ce75 Changing SET SQL_LOG_BIN so that it explicitely throws an error if 
user is not SUPER, instead of setting the value but ignoring it
silently internally.
 2004-03-26 19:25:22 +01:00
Sinisa@sinisa.nasamreza.org
e2b48a2232 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2004-03-26 17:01:55 +02:00
Sinisa@sinisa.nasamreza.org
09d26f0ff6 order_by.result: 
result of the test case for FORCE INDEX on ORDER BY
order_by.test:
  test case for FORCE INDEX on ORDER BY
sql_select.cc:
  Changing behaviour that MySQL server takes FORCE INDEX clause into account when optimising ORDER BY clause
 2004-03-26 17:01:13 +02:00
bar@bar.intranet.mysql.r18.ru
36e7f41d63 UTF8 now process space as PAD character correctly. 2004-03-26 18:14:39 +04:00
monty@mysql.com
baa45774d6 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/my/mysql-4.0
 2004-03-26 14:45:13 +02:00
monty@mysql.com
48680ee3a0 Allow keys with 0 segements in MyISAM 
This fixed a bug in SELECT DISTINCT when all selected parts where constants. (Bug #3203)
 2004-03-26 14:44:52 +02:00
bar@bar.intranet.mysql.r18.ru
3aea3e92ce 1. New data types, from the user point of view: 
BINARY(N) and VARBIBARY(N)
2. More 4.0 compatibility and more BINARY keyword consistency:
2a. CREATE TABLE a (a CHAR(N) BINARY) 
    is now synonym for
    CREATE TABLE a (a CHAR(N) COLLATE xxxx_bin)
2b. SELECT BINARY x
    is still synonin for
    SELECT x COLLATE xxxxx_bin.
 2004-03-26 16:11:46 +04:00
monty@mysql.com
447baa9011 After merge fixes + simple optimizations 2004-03-26 11:06:53 +02:00