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

2882 commits

Author SHA1 Message Date
marko@hundin.mysql.fi
20b60510e9 InnoDB: limit the recursion depth for ON (UPDATE|DELETE) CASCADE 
(Bug #4446)
 2004-07-15 15:46:22 +03:00
bell@sanja.is.com.ua
8ab5398bf7 check that all system tables deleted added 2004-07-15 14:17:30 +03:00
mskold@mysql.com
bddd075d73 Fixed bug #4106 and removed buggy pk update 2004-07-09 13:18:56 +02:00
monty@mysql.com
07808113d6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-07-09 10:55:47 +03:00
monty@mysql.com
c1032fe9eb Cleanup of db option cacheing 
Some bug fixes to last pushed code
 2004-07-09 10:55:16 +03:00
monty@mysql.com
064b8b8f65 Merge with 4.0 to get bug fixes 2004-07-09 02:29:28 +03:00
bar@mysql.com
6c996daa91 Bug#4338: mysql-test-run fails if compiled with non-latin1 character set 2004-07-08 18:54:07 +05:00
bar@mysql.com
a5025f4ca6 WL#807 Optimize loading database options in load_db_opt 
also known as
BUG#2326 Charset of table is determined by charset of db only if "USE db;"
 2004-07-08 15:03:01 +05:00
serg@serg.mylan
d0f53f7ee0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-07-07 23:51:25 +02:00
serg@serg.mylan
fe57b75079 bug#4441 - crash in UNHEX(NULL) 2004-07-07 23:49:03 +02:00
bar@mysql.com
6fdafa5635 Don't allow badly formed UTF8 identitiers 2004-07-07 16:39:43 +05:00
bar@mysql.com
aa679b62c0 Adding Roman (classical Latin) collation. 2004-07-07 15:20:23 +05:00
joreland@mysql.com
ee3aca091b Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-07-06 17:47:56 +02:00
serg@serg.mylan
d8dabe43fb Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-07-06 16:30:04 +02:00
serg@serg.mylan
021242bc6c mysql_fix_privilege_tables.sh: 
various fixes (for mysql-test-run at least):
  * accept --no-defaults
  * 4.0 compatible password handling (only it no other argumensts, only if doesn't start with --)
ps_3innodb.test:
  only run ps_3innodb.test if innodb is present
mysql-test-run.sh:
  it's --verbose, not --verbose=1
 2004-07-06 16:29:26 +02:00
bar@mysql.com
30a86a0be9 Bug#4417 binary character set breaks multi-byte table/field name. 2004-07-06 17:15:43 +05:00
bar@mysql.com
434e2e094c rpl_charset.result, rpl_charset.test: 
An addition to 1.2036 04/07/02: armscii8_bin was referenced to as armscii_bin in a mistake.
 2004-07-06 13:43:15 +05:00
joreland@mysql.com
27fc980e79 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1-ndb
 2004-07-06 10:20:52 +02:00
gordon@zero.local.lan
b437a2f3c9 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into zero.local.lan:/GORDON/MySQL/mysql-4.1/src
 2004-07-05 10:08:38 +02:00
joreland@mysql.com
d0aa80a698 Fix mysql-test-run ndb order by/endian issue 2004-07-05 07:14:45 +02:00
bell@sanja.is.com.ua
130740248b aggregate functions check during substitution made only for single row subselects (BUG#4400) 
restoring current senect pointer before PS rexecution (backport from 5.0)
removed spaces at  lines ends
 2004-07-04 08:46:28 +03:00
gordon@zero.local.lan
c87812d8e6 Added comments to the PS test files, to prevent modifications which may destroy the tests . 2004-07-02 20:01:34 +02:00
bar@mysql.com
4df5a14a6f Bug #4374 SHOW TABLE STATUS FROM ignores collation_connection 2004-07-02 16:52:02 +05:00
mskold@mysql.com
c708619d0b Added support for update of pk 2004-07-02 11:50:28 +02:00
gordon@zero.local.lan
8462b8aeb8 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-4.1 
into zero.local.lan:/GORDON/MySQL/mysql-4.1/src
 2004-07-01 16:35:52 +02:00
gordon@zero.local.lan
7071d062c9 WL#1564 Intensive test of prepared statements via 'mysqltest' 2004-07-01 16:30:29 +02:00
monty@mysql.com
78c1938848 Portability fixes (For Netware) 2004-07-01 17:26:45 +03:00
ram@gw.mysql.r18.ru
6acd105b16 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b4089
 2004-06-29 13:51:35 +05:00
ram@gw.mysql.r18.ru
c0c1c3200a a fix (bug #4304: TRUNCATE <table of type BDB> , wrong result). 2004-06-29 13:49:50 +05:00
vva@eagle.mysql.r18.ru
e228547a61 s/\r\n/\n/ in mysql-test/*/system_mysql_db* 
according to http://www.bitkeeper.com/Documentation.FAQS.Windows_NT.html
 2004-06-28 15:53:49 +05:00
mskold@mysql.com
146d68871b Merged 2004-06-27 16:56:52 +02:00
serg@serg.mylan
cb188a89c1 after merge fix 2004-06-27 13:16:19 +02:00
serg@serg.mylan
f941f842c3 make lowercase_table3 to work 2004-06-27 11:57:08 +02:00
serg@serg.mylan
3236093b8b removed using lex->select_lex.options is SHOW TABLE [STATUS] commands (BUG#4288) 2004-06-27 00:34:05 +02:00
serg@serg.mylan
a5c8b3ee59 correct eq() method for Item_param (BUG#4233) 2004-06-26 23:55:38 +02:00
serg@serg.mylan
450e5b0119 after merge fixed 2004-06-26 14:21:32 +02:00
monty@mysql.com
8c867328cd Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-06-25 21:56:42 +03:00
monty@mysql.com
b1d08ba2b4 Merge with 4.0 to get the latest bug patches to 4.1 2004-06-25 20:13:05 +03:00
bell@sanja.is.com.ua
45411ca0b5 merge 2004-06-25 18:33:31 +03:00
serg@serg.mylan
3ba6fd97b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-06-25 15:12:51 +02:00
serg@serg.mylan
3b59dd1bd0 bug#4008 - merge table cannot determine what key caused "dupl. key" error 2004-06-25 15:12:13 +02:00
ingo@mysql.com
8db6c064df Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-bug2686
 2004-06-25 14:44:37 +02:00
bell@sanja.is.com.ua
74b01ca387 type of parameter assignment for parameters from variables added (BUG#4280) 2004-06-25 15:16:00 +03:00
bell@sanja.is.com.ua
6e1eb6a78c 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-06-25 14:48:15 +03:00
ingo@mysql.com
57da928039 Merge 2004-06-25 12:59:47 +02:00
ingo@mysql.com
958cf857a3 Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-bug3565
 2004-06-25 12:14:54 +02:00
serg@serg.mylan
3452445559 remove ^M's 
compile even without InnoDB
 2004-06-25 11:33:03 +02:00
bell@sanja.is.com.ua
4092635155 fixed EXPLAIN behaviour with prepared statements (BUG#4271) 2004-06-25 11:37:43 +03:00
serg@serg.mylan
37314708b7 merged 2004-06-24 23:29:28 +02:00
serg@serg.mylan
1c37f8e20e Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-06-24 19:47:53 +02:00
serg@serg.mylan
1ff21a9e64 bug#4089 - JOIN::join_free calling mysql_unlock w/o index_end() before 2004-06-24 19:46:50 +02:00
bell@sanja.is.com.ua
c6e2f6ac13 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-innodb-4.1
 2004-06-24 19:43:47 +03:00
bell@sanja.is.com.ua
de9cefaa77 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-24 19:03:58 +03:00
bar@mysql.com
62aeb88638 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-06-24 18:51:32 +05:00
bar@mysql.com
aa27a7858e "Version" column in SHOW TABLE STATUS. 2004-06-24 18:46:41 +05:00
ingo@mysql.com
18cd61d0d0 bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock. 
Redesigned the handler close functions so that they are usable
at different places where waiting for closing tables is done.
 2004-06-24 15:06:56 +02:00
ingo@mysql.com
fa86cada0c bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash. 
Added put_length() to get_length() and unpack_key() to pack_key().
Keys were packed with the minimum size of the length field for the key part and 
unpacked with length size of the base column. 
For the purpose of optimal key packing we have the method pack_key(), while rows are 
packed with pack(). Now keys are unpacked with unpack_key() and no longer with 
unpack() which is used for rows.
 2004-06-24 14:54:28 +02:00
sergefp@mysql.com
e4270dd595 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/dbdata/psergey/mysql-4.1-root
 2004-06-24 15:52:52 +04:00
tomas@poseidon.bredbandsbolaget.se
0f9dc08188 added order by 2004-06-24 11:52:50 +00:00
ingo@mysql.com
d74558eb36 Merge mysql.com:/home/mydev/mysql-4.0 
into mysql.com:/home/mydev/mysql-4.0-bug2688
 2004-06-24 12:07:00 +02:00
bell@sanja.is.com.ua
d3efbb9d3b 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-24 10:55:48 +03:00
bell@sanja.is.com.ua
7483b3cf96 parameter of my_yyoverflow made independed from YYSIZE_T (BUG#4204) 2004-06-24 02:57:57 +03:00
guilhem@mysql.com
7480ef3840 disabling the --innodb-safe-binlog option. It should be fixed to work with MyISAM too, 
before being available to users. That will be the case in 4.1.4.
The "bk commit in mysqldoc" corresponding to this feature was not pushed.
Removing the 6 tests, they'll be pushed again later.
 2004-06-24 01:06:48 +02:00
guilhem@mysql.com
bccf57fbb2 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-1717
 2004-06-23 23:52:49 +02:00
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
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
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
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
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
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
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
serg@serg.mylan
683a8893a8 mysqltest.c: don't hardcode variables to be taken from environment. 
use MYSQL_TCP_PORT instead of 3306 in tests
 2004-06-11 18:26:13 +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
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
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
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
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
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
monty@mysql.com
70c2256d2f Merge with 4.0 to get fixes for netware 2004-06-02 00:09:14 +03:00
monty@mysql.com
197fcf1ee4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-06-01 22:30:03 +03:00
monty@mysql.com
017096695a Update version number 
Fixed serbian error messages
Fix for windows regarding changed variable name
 2004-06-01 22:29:46 +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
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
monty@mysql.com
518019f511 Remove some code from sql_yacc.cc that doesn't do anything except produce warnings on VC++ 2004-05-28 00:03:19 +03:00
monty@mysql.com
e9b7e3baa8 merge with 4.0 to get fix to VC++ project files 2004-05-27 23:45:22 +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
monty@mysql.com
c342318c6e Fixed test to not crash when ndb is not in use 2004-05-26 20:56:39 +03:00
monty@mysql.com
98741a50df Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2004-05-26 19:13:12 +03:00
monty@mysql.com
7d8f8bc77b Changed prototype of killed_ptr() to make it more portable 
Applied patches for Netware
 2004-05-26 19:12:49 +03: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