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

2549 commits

Author SHA1 Message Date
guilhem@mysql.com
324ff6dedf Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-10-08 20:53:07 +02:00
monty@narttu.mysql.fi
d37a5c4dd7 Indentation cleanups 
Remove wait_if_global_read_lock on commit as this can cause deadlocks
 2003-10-08 21:50:05 +03:00
monty@mishka.mysql.fi
498e1c6d95 Fixed memory leak in send_file 2003-10-08 21:02:53 +03:00
monty@narttu.mysql.fi
dc6f07256c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-10-08 18:55:34 +03:00
monty@narttu.mysql.fi
9e57c12b5a Fixed bug in error handling of CREATE ... SELECT 
More tests cases
After merge fixes
 2003-10-08 18:53:31 +03:00
bell@laptop.sanja.is.com.ua
afac13d033 Some simple optimisation 
= ANY and <> ALL converted to (NOT) IN to get advantage of IN optimisation
 2003-10-08 17:40:54 +03:00
monty@narttu.mysql.fi
246febee42 merge with 4.0 to get fix for mysqlbinlog 2003-10-08 12:05:27 +03:00
monty@narttu.mysql.fi
d9ff665102 Fixes after merge 2003-10-08 12:01:58 +03:00
bell@laptop.sanja.is.com.ua
381b680868 fixed error handling in SET and DO operators (BUG#1484) 2003-10-08 11:19:09 +03:00
monty@narttu.mysql.fi
d00d9110ba Fixed test case that my last patch to mysqlbinlog broke. 
Changed --remote to --read-from-remote-server (mysqlbinlog)
 2003-10-08 10:23:54 +03:00
bell@laptop.sanja.is.com.ua
9b4018066e Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
 2003-10-08 08:50:57 +03:00
bar@bar.mysql.r18.ru
c5c4e31545 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-10-08 10:19:25 +05:00
bar@bar.mysql.r18.ru
9023009ae3 query_cache.result, query_cache.test: 
Character set variables test
 2003-10-08 10:18:38 +05:00
greg@mysql.com
7a6239640f Fixed test case to work on NetWare. 2003-10-08 00:19:44 -04:00
guilhem@gbichot2
528b082705 mysql_real_connect picks the Unix login when the user "" is used. 
This makes the test non-repeatable when running as root.
 So I change to not use the "" user, but a random string which will
 always result in the @localhost user being selected by the server.
 2003-10-07 23:15:13 +02:00
serg@serg.mylan
9d198d35bf merged 2003-10-07 20:41:07 +02:00
guilhem@mysql.com
ed5d059202 Fix for a test failure with the standard (no-BDB) binary: 
as the test is meaningful only if the slave supports transactions,
we require this. As in 4.0 the slave runs with --skip-innodb, we
test for BDB.
 2003-10-07 20:41:06 +02:00
monty@narttu.mysql.fi
1f8e38d03a Merge with 4.0 to get fix for mysqlbinlog 2003-10-07 21:41:06 +03:00
monty@narttu.mysql.fi
1b06af3a97 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-10-07 21:41:05 +03:00
vva@eagle.mysql.r18.ru
16b8fd8ece Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
 2003-10-07 14:41:04 -04:00
bell@laptop.sanja.is.com.ua
1324a97f63 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
 2003-10-07 21:01:57 +03:00
monty@narttu.mysql.fi
b82b76f480 Simple cleanups 2003-10-07 15:44:31 +03:00
monty@narttu.mysql.fi
6056cfadfc Merge with 4.0.16 2003-10-07 15:42:26 +03:00
bell@laptop.sanja.is.com.ua
18bb43671d Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
 2003-10-07 01:31:16 +03:00
monty@narttu.mysql.fi
446d40e880 After merge fixes 2003-10-07 00:23:29 +03:00
bell@laptop.sanja.is.com.ua
e527f268d5 fixed error names 2003-10-06 22:35:05 +03:00
serg@serg.mylan
511589a4f8 results updated 2003-10-06 20:11:39 +02:00
serg@serg.mylan
b58098c3b9 bug #1434 (and related issues) 2003-10-06 20:02:27 +02:00
bell@laptop.sanja.is.com.ua
e1b53fdd42 Merge 2003-10-06 20:55:06 +03:00
bell@laptop.sanja.is.com.ua
ba26a1aa64 fix error messages 
fix derived inside subqueries
 2003-10-06 13:16:56 +03:00
bell@laptop.sanja.is.com.ua
179acaa37e Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-derived-4.1
 2003-10-06 12:04:08 +03:00
bell@laptop.sanja.is.com.ua
16733e423e prohibited using derived tables in UPDATE command (BUG#1477) 
fixed incorrect table name in test
 2003-10-05 21:09:50 +03:00
paul@ice.snake.net
2de4f6b12d Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.0 
into ice.snake.net:/Users/paul/mysql-4.0
 2003-10-04 17:42:43 -05:00
paul@ice.snake.net
62de13dca3 Ride hobby horse. 2003-10-04 17:41:17 -05:00
vva@eagle.mysql.r18.ru
af3184909c Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.0
 2003-10-03 17:55:57 -04:00
vva@eagle.mysql.r18.ru
795e14871d Fixed bug #1323 (varchar fields becoming char fields adter create ... select) 2003-10-03 17:54:32 -04:00
guilhem@mysql.com
ae054504e3 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-10-03 22:18:34 +02:00
guilhem@gbichot2
5e55c4b809 editing comments. 2003-10-03 22:14:23 +02:00
guilhem@mysql.com
52ae1609eb When the I/O thread was stopped while copying a long transaction, and restarted, 
Rotate_log_event::exec_event() believed that the relay log was corrupted. Fixed it
by moving the test for corruption to Start_log_event::exec_event(). 
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.
I did a separate commit in 4.1 (so this should not be merged to 4.0) because
code is a bit different in 4.1.
A test to see if the slave detects when the master died while writing a 
transaction to the binlog (uses a forged truncated binlog I made).
 2003-10-03 22:13:01 +02:00
guilhem@gbichot2
6bbf52d2ac Fix for a rpl_relayrotate failure. 
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.
 2003-10-03 20:07:08 +02:00
monty@mishka.mysql.fi
989ca397b2 Optimized code for setting user variables with := and fixed some bugs in old code (Bug #1194) 
Use forced close of socket to make mysqld shutdown faster when used under valgrind
 2003-10-03 00:40:27 +03:00
serg@serg.mylan
9a057fd0bd ft1->ft2 auto-conversion on INSERT (WL#725) 2003-10-02 20:22:29 +02:00
guilhem@mysql.com
b95e3911a2 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-10-02 16:26:39 +02:00
guilhem@gbichot2
d099c0ed40 Had mangled the order of if()s in a previous changeset (1.1596) (not pushed), 
correcting it now. Thanks Dmitri for spotting this.
 2003-10-02 16:19:33 +02:00
bell@laptop.sanja.is.com.ua
267444b95a Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc_crash-4.0
 2003-10-02 16:33:50 +03:00
guilhem@gbichot2
2f11e5d1d3 fix for BUG#1331: "Unexistent user variable is not replicated". 
When an update query is to be written to the binlog, and it reads unset
user variables (example: INSERT INTO t VALUEs(@a) where @a does not exist),
we create the variable like if it had been set with SET before, and we loop
(i.e. we redo the steps of logging, now that the variable exists).
 2003-10-02 10:31:37 +02:00
igor@rurik.mysql.com
f17ff0bc39 Many files: 
Fix after manual merge
 2003-10-01 23:37:05 -07:00
igor@rurik.mysql.com
f12cbd4bb8 Manual merge after improving concurrency for key cache reassignment 2003-10-01 20:20:17 -07:00
igor@rurik.mysql.com
17aecac32c Manual merge after improving concurrency for key cache reassignment 2003-10-01 20:16:36 -07:00
vva@eagle.mysql.r18.ru
14a2466532 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0 
into eagle.mysql.r18.ru:/home/vva/work/BUG_1194/mysql-4.0
 2003-10-01 12:22:30 -04:00
paul@teton.kitebird.com
95dffdb956 Subselect -> subquery 2003-09-30 11:40:15 -05:00
guilhem@mysql.com
7234ed2681 fix for a random test failure on hpux/ia64 
(a missing synchronization in the test)
 2003-09-29 22:56:31 +02:00
dlenev@mysql.com
573e5bffbf Added resetting of replace_result patterns after --exec command in mysqltest (in order to be consistent with ordinary query execution). 2003-09-29 23:10:30 +04:00
monty@narttu.mysql.fi
89f30200bc Removed random chars after filename for LOAD DATA INFILE (in mysqlbinlog) 
Add quoting for use `database` for mysqlbinlog
Removed test ins0000001
Add support for --replace for exec in mysqltest
Don't refer to install dir in mysqlbinlog.result
 2003-09-29 12:31:35 +03:00
guilhem@mysql.com
9d7014c07b Fix for BUG#1345 "SQL Syntax Error in binarylog with DROP TABLES": 
it's just backquoting the db's and table's names
when writing DROP TEMPORARY TABLE to the binlog when a connection ends.
A testcase for this.
 2003-09-28 18:31:49 +02:00
dlenev@mysql.com
4fedb81eda Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-rplunt
 2003-09-26 17:55:10 +04:00
dlenev@dlenev.mshome
3f586da948 Fixed spurios failures of rpl_until test. 2003-09-26 17:42:05 +04:00
dlenev@mysql.com
94e9e04250 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-binlog
 2003-09-25 20:05:39 +04:00
bar@bar.mysql.r18.ru
d5d4923107 LPAD and RPAD test with UCS2 was added. 2003-09-25 18:06:39 +05:00
bar@bar.mysql.r18.ru
ebbc1dc13e LPAD() and RPAD() are now multibyte-compatible 2003-09-25 17:31:20 +05:00
vva@eagle.mysql.r18.ru
fd2925b7c7 fixed bug #1194 
(changes in Item_func_set_user_var::update, ::val, ::val_str, ::val_int)
 2003-09-24 19:30:20 -04:00
guilhem@mysql.com
9854acae25 Fix for BUG#1391: 
"If LOAD DATA INFILE 'small_file' fails on master, slave leaves temp files"
(the bug is in the master)
 2003-09-25 00:14:46 +02:00
dlenev@mysql.com
977c7b2d65 Test for mysqlbinlog 
Particularly for BUG#1340 mysqlbinlog coredumps when reading Exec
event without seeing Create_file event before
 2003-09-24 23:25:58 +04:00
ram@gw.mysql.r18.ru
75e89e0af8 Added MYSQL_BINLOG variable. 2003-09-24 16:46:19 +05:00
ram@gw.mysql.r18.ru
5e07599ebe #1169: Add --exec command to mysqltest 2003-09-24 16:13:47 +05:00
bar@bar.mysql.r18.ru
52bb4efcdd regexp worked only with the default character set. 
Now it can work with any character set.
 2003-09-24 13:57:26 +05:00
dlenev@mysql.com
b8c07da057 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-868
 2003-09-23 13:28:48 +04:00
bar@bar.mysql.r18.ru
147046367e Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-09-22 17:28:19 +05:00
bar@bar.mysql.r18.ru
1faafac4fd Bug 1181 fix. LIKE didn't work with UCS2 character set. 2003-09-22 17:18:47 +05:00
dlenev@mysql.com
5bba265e0e Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-868
 2003-09-22 11:00:51 +04:00
ram@gw.mysql.r18.ru
6312ad254c Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
 2003-09-22 11:39:29 +05:00
dlenev@mysql.com
467f66532a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-868
 2003-09-20 23:57:11 +04:00
bell@laptop.sanja.is.com.ua
a947a2bf53 fixed processing aggregate functions with static tables (BUG#1318) 2003-09-20 18:30:36 +03:00
guilhem@mysql.com
f162eca688 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-09-19 19:08:43 +02:00
guilhem@mysql.com
118670017f removing my chmods so that the test can be run on non-Unix platforms 
(kind request from the Novell team).
Note that old chmods in rpl_rotate_logs remain.
 2003-09-19 19:07:41 +02:00
bar@bar.mysql.r18.ru
acf5ba7d59 New test for UTF8 functionality 2003-09-19 16:59:14 +05:00
bar@bar.mysql.r18.ru
e0a0790ebb Fixed that multibyte charsets didn't honor multibyte 
sequence boundaries in functions LIKE and LOCATE in
the case of "binary" collation. Comparison was done
like if the strings were just a binary strings without
character set assumption.
 2003-09-19 15:18:19 +05:00
ram@gw.mysql.r18.ru
28c92200fb Test for mysqldump 2003-09-19 14:02:49 +05:00
ram@gw.mysql.r18.ru
50254237de Fix for the bug #1333: COMPRESS(NULL) segfaults. 2003-09-19 12:25:03 +05:00
kostja@oak.local
6fba16eabf Applied Monty corrections to the FULL SCAN 
optimiser bug patch.
 2003-09-17 21:52:05 +04:00
bell@sanja.is.com.ua
fb48eaaa81 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-union-4.1
 2003-09-17 14:55:27 +03:00
kostja@oak.local
048245ae9d fixed test result to be in sync with the optimiser 2003-09-17 14:00:43 +04:00
kostja@oak.local
a68800954c Merge oak.local:/home/kostja/mysql/mysql-4.0-root 
into oak.local:/home/kostja/mysql/mysql-4.0-rightnow
 2003-09-16 21:26:26 +04:00
kostja@oak.local
668e7dcec8 select.test cleanup 2003-09-16 20:28:29 +04:00
bar@bar.mysql.r18.ru
fb4f5e7d42 Bug fix: 
SET character_set_connection=newcharset;
  SELECT hex('text');

The above sequence failed in some cases.
 2003-09-16 17:14:23 +05:00
bar@bar.mysql.r18.ru
1932b40c13 UCS tests 2003-09-16 16:26:33 +05:00
bar@bar.mysql.r18.ru
83c6946232 Bug fix: 
http://bugs.mysql.com/bug.php?id=1264
 2003-09-16 15:43:17 +05:00
bar@bar.mysql.r18.ru
710599ca2e Bug fix: 
http://bugs.mysql.com/bug.php?id=1264
 2003-09-16 12:36:36 +05:00
bar@bar.mysql.r18.ru
4cb99ed5bb Bug fix: 
http://bugs.mysql.com/bug.php?id=1129
From:	Georg Richter
Description: there is a problem with special chars like umlauts in comments
 2003-09-16 12:14:40 +05:00
dlenev@dlenev.mshome
b5c1168155 Made rpl_until test independent from mysqld version 2003-09-16 02:58:46 +04:00
kostja@oak.local
ab576328f0 Fixed bug in the optimiser for FULL TABLE SCAN case: 
to estimate correctly cost of full table scan we should take into
account rows read and skipped on each iteration.
 2003-09-15 22:21:39 +04:00
bell@sanja.is.com.ua
702b5ad4d6 fixed server crash on moving query block with pointers to same table in it (BUG#988) 
removed server options
 2003-09-15 15:16:13 +03:00
guilhem@mysql.com
2266c99bb7 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-09-15 12:45:48 +02:00
bar@bar.mysql.r18.ru
8d05911df0 Merge abarkov@build.mysql.com:/home/bk/mysql-4.1 
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
 2003-09-15 14:48:23 +05:00
bar@bar.mysql.r18.ru
f55b05e2cf In CREATE syntax: KEY a (field_name(10)) 
10 now means "number of characters", not number of bytes.
 2003-09-15 14:45:42 +05:00
bell@sanja.is.com.ua
10c962bd41 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
 2003-09-15 11:43:11 +03:00
guilhem@mysql.com
364bb41f4b Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-09-15 10:31:31 +02:00
bar@bar.mysql.r18.ru
9a5e82ad64 type_nchar.result: 
I forgot to push it in the previous changeset.
 2003-09-15 12:48:34 +05:00
bell@sanja.is.com.ua
eca64292e6 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
 2003-09-15 10:35:52 +03:00
bar@bar.mysql.r18.ru
1726b4d89e New syntax: 
CREATE TABLE t1(a NVARCHAR(10))
This is for compatibility with MSSQL, DB2, Informix and some other DBMSs.

Note, standard SQL doesn't have "NVARCHAR" syntax.
There are only these syntaxes in SQL2003:
 NATIONAL VARCHAR
 NCHAR VARCHAR
 NATIONAL CHARACTER VARYING 
 NCHAR VARYING

- Tests were added for all the above syntaxes.
 2003-09-15 10:26:48 +05:00
bell@sanja.is.com.ua
ea187cfd42 fixed proccesing global LIMIT in last SELECT of UNION 2003-09-14 22:12:55 +03:00
dlenev@dlenev.mshome
f478722077 Fixed openssl_1 test after error message was updated 2003-09-14 18:07:14 +04:00
dlenev@mysql.com
6d62d31049 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-868
 2003-09-14 17:19:53 +04:00
dlenev@dlenev.mshome
f7a4d682d5 Post merge fixes. Fixed tests after adding UNTIL conditions 
to SHOW SLAVE STATUS.
 2003-09-14 17:18:38 +04:00
bell@sanja.is.com.ua
46b8c3ea8b renamed join_types (as was suggested by Peter Gulutzan) 2003-09-14 09:40:57 +03:00
dlenev@mysql.com
2c24b2e9b4 Manual merge after commiting START SLAVE UNTIL 2003-09-14 01:57:09 +04:00
dlenev@dlenev.mshome
c0cfae1c8d Implemented support for START SLAVE UNTIL (WL#868) 2003-09-14 00:13:41 +04:00
Sinisa@sinisa.nasamreza.org
cde0c36962 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-09-13 20:00:42 +03:00
Sinisa@sinisa.nasamreza.org
a26847c275 Fixes for OPTION_FOUND_ROWS in UNION's 2003-09-13 19:56:58 +03:00
serg@serg.mylan
d4b5b879bd "normal" warning in test suite disabled 
bad merge fixed
 2003-09-13 16:05:17 +02:00
Sinisa@sinisa.nasamreza.org
0088e1c657 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-09-12 19:23:47 +03:00
Sinisa@sinisa.nasamreza.org
a424ccee17 Fix for a bug #1231 
Parse error caused global ORDER BY to be initialized although it should
not have been.
 2003-09-12 19:17:30 +03:00
monty@mashka.mysql.fi
c477002fd4 Fix results for mix_innodb_myisam_binlog 
Optimize calls to current_thd
 2003-09-12 05:54:12 +03:00
monty@mashka.mysql.fi
04c43fca8e Optimize thai character handling 
Remove sel000xxxx tests
After merge fixes
 2003-09-12 04:18:07 +03:00
guilhem@mysql.com
59663fc661 * Fix for BUG#1248: "LOAD DATA FROM MASTER drops the slave's db unexpectedly". 
Now LOAD DATA FROM MASTER does not drop the database, instead it only tries to
create it, and drops/creates table-by-table.
* replicate_wild_ignore_table='db1.%' is now considered as "ignore the 'db1'
database as a whole", as it already works for CREATE DATABASE and DROP DATABASE.
 2003-09-11 23:17:28 +02:00
monty@mashka.mysql.fi
7538242e4f merge with 4.1 tree 2003-09-11 20:31:40 +03:00
monty@mashka.mysql.fi
73f66f68fd merge with 4.0.15 2003-09-11 20:24:14 +03:00
monty@mashka.mysql.fi
45aa92c574 After merge fixes. 
Note that mix_innodb_myisam_binlog and union fails after this patch (Will be fixed shortly by maintaners of this code)
 2003-09-11 19:06:23 +03:00
guilhem@mysql.com
332ac06629 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-09-10 17:15:21 +02:00
bell@sanja.is.com.ua
23ad0cfbbb Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-in-4.1
 2003-09-10 09:43:30 +03:00
ram@mysql.r18.ru
4b1c22c57e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.r18.ru:/usr/home/ram/work/4.1
 2003-09-10 11:19:39 +05:00
bell@sanja.is.com.ua
a837b71e6c after merge fix 2003-09-09 23:07:39 +03:00
bell@sanja.is.com.ua
ad07ffbf6d merge 2003-09-09 22:26:19 +03:00
monty@mashka.mysql.fi
99490870e6 Cleaned up last bug fixes 
Fix bug in SHOW GRANTS when there is a column privilege but no table privilege
 2003-09-09 20:06:50 +03:00
Sinisa@sinisa.nasamreza.org
5e32805713 Fix for a bug #1226. 
Happens when braces are used on a single select, which leads
to the uninitialized global parameters structure.
 2003-09-09 15:23:38 +03:00
bell@sanja.is.com.ua
813d81c726 removing additional IN subquery condition 
fixed IN optimisation bug
 2003-09-08 21:58:09 +03:00
ram@mysql.r18.ru
44d6102f81 Fix for the bug #1209: SELECT DATABASE(). 2003-09-08 17:30:53 +05:00
ram@mysql.r18.ru
0caa462b77 #1169: Add --exec command to mysqltest 2003-09-08 10:53:51 +05:00
bell@sanja.is.com.ua
a02094ef10 fixed row union processing 2003-09-07 20:35:10 +03:00
monty@mashka.mysql.fi
80565e1352 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-tmp
 2003-09-07 15:14:32 +03:00
monty@mashka.mysql.fi
045eb3d8fe Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-09-05 17:06:36 +03:00
monty@mashka.mysql.fi
75b2c4a62f Fixed rare bug in MYISAM introduced in 4.0.3 where the index file header was not updated directly after an UPDATE of split dynamic rows. 2003-09-05 06:42:55 +03:00
gluh@gluh.mysql.r18.ru
548d7dc948 Fix for bug 1176 2003-09-04 17:12:20 +05:00
wax@kishkin.ru
b34c3934d9 BUG 
correct bug 1085 (a problem with min/max functions)
add tests of bugs 833,836,1085
 2003-09-04 06:44:16 +06:00
serg@serg.mylan
be96cc0984 bug #1172 - crash on force index() and SEL_ARG::MAYBE_KEY 2003-09-03 22:27:04 +02:00
monty@narttu.mysql.fi
4b3b4b9250 merge 2003-09-03 19:53:08 +03:00
serg@serg.mylan
7d2b0a0ce7 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-09-03 15:40:19 +02:00
kostja@oak.local
424a647069 post-merge fixes 2003-09-03 16:43:41 +04:00
kostja@oak.local
36dd82c1d5 merge commit, hope that none of bar and dlenev changes were 
lost.
 2003-09-03 14:12:10 +04:00
serg@serg.mylan
755455e15c merged 2003-09-03 12:07:18 +02:00
serg@serg.mylan
2fcab1c2ee CHECKSUM TABLE table1, table2, ... [ QUICK | EXTENDED ] 2003-09-03 11:34:32 +02:00
ram@mysql.r18.ru
5e6d8dd7fe Fix for the bug #971: ORDER BY DESC doesn't return correct num of rows with BDB and an indexed column. 2003-09-02 21:09:28 +05:00
dlenev@dlenev.mshome
f655ba9866 Updated various tests results which were missed during auto-merge 
with replication over SSL patch.
 2003-09-01 19:13:19 +04:00
serg@serg.mylan
de627fde80 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-09-01 14:59:56 +02:00
serg@serg.mylan
b2c83e7f03 workaround for IN's special treatment of first argument. Not for 4.1 2003-09-01 14:18:27 +02:00
dlenev@mysql.com
73ab4be246 Manual merge fixes 2003-09-01 16:14:54 +04:00
dlenev@dlenev.mshome
2486222cd2 Implemented replication over SSL 
Added proper options to CHANGE MASTER TO, new fields to SHOW SLAVE STATUS,
 Honoring this parameters during connection to master.
 Introduced new format of master.info file
 2003-09-01 15:16:20 +04:00
Sinisa@sinisa.nasamreza.org
b0a8931986 Two small fixes 2003-08-30 18:21:24 +03:00
monty@narttu.mysql.fi
77a70a0a24 merge with 4.0.15 2003-08-29 13:44:35 +03:00
gluh@gluh.mysql.r18.ru
144d0efaaa Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.fix
 2003-08-29 11:24:33 +05:00
monty@narttu.mysql.fi
27e331c30a Revert change of lower-case-table handling as this breaks how alias works. 
Changes like this should be done to 4.1, not to a stable release
 2003-08-29 04:17:30 +03:00
bell@laptop.sanja.is.com.ua
d6761fade4 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-aggregate-4.1
 2003-08-28 17:27:46 +03:00
vva@eagle.mysql.r18.ru
79be48410d fixed merge mistake 2003-08-28 10:26:56 -04:00
gluh@gluh.mysql.r18.ru
e4951147cf Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE 
This commit is related to my previos one(ChangeSet 1.1583 03/08/27 18:03:39).
Note about COMMIT&ROLLBACK:
  Only 'COMMIT' statement updates the binary log. 
  'ROLLBACK' statement doesn't update the binlog.
 2003-08-28 18:09:00 +05:00
serg@serg.mylan
d09626d9d6 post-merge fixes 2003-08-28 13:14:54 +02:00
monty@narttu.mysql.fi
17d8cc22cb merge with 3.23 to get for overrun in ISAM tables with man fields and a blob. 2003-08-28 12:35:36 +03:00
monty@narttu.mysql.fi
d5ed93e80e Updated test for ISAM overflow bug 2003-08-28 12:28:51 +03:00
monty@narttu.mysql.fi
8a77f97079 Add detection of in_addr_t 
Add pack_bits to pack_reclength for dynamic rows.  This solves buffer a possible buffer overflow on update.
(This will probably solve bug #563)
Fix test for available file descriptors in mysqltest
Fixed core dump bug in replication tests when running without transactional table support
 2003-08-28 06:08:17 +03:00
vva@eagle.mysql.r18.ru
60fc3ae02b Merge 2003-08-27 21:26:00 -04:00
bell@laptop.sanja.is.com.ua
3d2a3804a1 reset() split in 2 function clear() & add() 
aggregate function reinitialization (if no rows was found) made with help of clear()
(fixed BUG#860)
 2003-08-28 03:10:14 +03:00
vva@eagle.mysql.r18.ru
40757beb81 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1 
into eagle.mysql.r18.ru:/home/vva/work/BUG_910/mysql-4.1
 2003-08-27 19:15:27 -04:00
vva@eagle.mysql.r18.ru
cde2b50514 fixed bug #910 (right type of ifnull function) 2003-08-27 19:11:54 -04:00
gluh@gluh.mysql.r18.ru
4c076ea6d7 Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE 2003-08-27 18:03:39 +05:00
Sinisa@sinisa.nasamreza.org
566ebb63ce merge fixes 2003-08-27 14:36:38 +03:00
monty@narttu.mysql.fi
fe9dc5e711 Add column names for metadata when running mysql with -T 
Change metadata info so that that MIN() and code MAX() reports that they can return NULL. Bug #324
 2003-08-27 10:26:03 +03:00
monty@narttu.mysql.fi
66b160c253 vio ssl structure renames (to get rid of ending _) 
Added TCP/IP read/write timeout for windows
Check on windows if second server is started with same TCP/IP port
 2003-08-27 02:51:39 +03:00
igor@rurik.mysql.com
055daee79d Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2003-08-26 15:16:29 -07:00
igor@rurik.mysql.com
2090d57929 key_cache.result, sql_lex.h, sql_yacc.yy, set_var.cc, sql_lex.cc: 
After merge fix
 2003-08-26 15:14:13 -07:00
bell@laptop.sanja.is.com.ua
8b8b984da0 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
 2003-08-26 23:32:20 +03:00
monty@narttu.mysql.fi
1d0b539263 Fix for bug in ROLLUP when all tables where 'const' tables (Bug #714) 2003-08-26 20:23:48 +03:00
monty@narttu.mysql.fi
7b99412988 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into narttu.mysql.fi:/my/mysql-4.1
 2003-08-26 17:53:42 +03:00
monty@narttu.mysql.fi
753cb8509c Cleanups 
BTREE, HASH and RTREE are not reserved symbols anymore
 2003-08-26 17:52:54 +03:00
bell@laptop.sanja.is.com.ua
48825fe40b after merge fix 2003-08-26 17:45:42 +03:00
bell@laptop.sanja.is.com.ua
eb3240a908 merge 2003-08-26 16:49:53 +03:00
bell@laptop.sanja.is.com.ua
7a86c7df28 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
 2003-08-26 16:42:49 +03:00
bell@laptop.sanja.is.com.ua
31657edc5f Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
 2003-08-26 16:24:51 +03:00
igor@rurik.mysql.com
40193a7fa5 Manual merge 2003-08-26 00:13:22 -07:00
monty@narttu.mysql.fi
2c1f1206c3 Better fix for myisamchk --sort-index on windows 
Fixed deadlock bug when doing resize of key buffer while key buffer was in active use
 2003-08-25 17:19:44 +03:00
Sinisa@sinisa.nasamreza.org
58c659a3bd symlink.result: 
Fix for a small error in the merge from 4.0
 2003-08-25 17:07:14 +03:00
bell@laptop.sanja.is.com.ua
5b28d4a9a4 removed --rpl option of ./mysql-test-run 
(./mysql-test-run t/rpl*.test  do same work)
 2003-08-25 16:40:14 +03:00
Sinisa@sinisa.nasamreza.org
4ba1506244 union.result: 
same as above
sql_lex.h:
  same as above 
sql_union.cc:
  same as aobve
sql_select.cc:
  Fixing that SQL_CALC_FOUND_ROWS work properly in UNION's in 4.1
  Plus updating some fields in THD in the proper places 
  plus fixing a wrong result
 2003-08-23 21:21:02 +03:00
bell@laptop.sanja.is.com.ua
f77f46d8eb Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
 2003-08-23 13:33:02 +03:00
bell@laptop.sanja.is.com.ua
5553868638 fixed bug of lack of fix_fields call (after merge bugfix (SCRUM)) 
fixed bug in Item_sum
fixed bug in dependence remover
after merge fix
 2003-08-23 13:29:38 +03:00
bell@laptop.sanja.is.com.ua
8c0ba5ded3 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any-4.1
 2003-08-22 19:56:03 +03:00
serg@serg.mylan
eb3912c05a bug #1078. two innodb+delayed crashes 2003-08-22 18:21:23 +02:00
Sinisa@sinisa.nasamreza.org
ced195f8a9 After merge fixes 2003-08-22 18:43:46 +03:00
Sinisa@sinisa.nasamreza.org
4d2902a27d grant.result, grant.test, sql_acl.cc: 
Fix for a bug #878
 2003-08-22 18:32:11 +03:00
guilhem@mysql.com
9676fdcbcd Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-08-22 15:42:22 +02:00
guilhem@mysql.com
759a3c1e3c 2 minor edits, plus 
fix for BUG#1113 "INSERT into non-trans table SELECT ; ROLLBACK" does not send warning"
and
fix for BUG#873 "In transaction, INSERT to non-trans table is written too early to binlog".
Now we don't always write the non-trans update immediately to the binlog;
if there is something in the binlog cache we write it to the binlog cache
(because the non-trans update could depend on a trans table which was modified
earlier in the transaction); then in case of ROLLBACK, we write the binlog
cache to the binlog, wrapped with BEGIN/ROLLBACK.
This guarantees that the slave does the same updates.
For ROLLBACK TO SAVEPOINT: when we execute a SAVEPOINT command we write it
to the binlog cache. At ROLLBACK TO SAVEPOINT, if some non-trans table was updated,
we write ROLLBACK TO SAVEPOINT to the binlog cache; when the transaction
terminates (COMMIT/ROLLBACK), the binlog cache will be flushed to the binlog
(because of the non-trans update) so we'll have SAVEPOINT and ROLLBACK TO
SAVEPOINT in the binlog.

Apart from this rare case of updates of mixed table types in transaction, the
usual way is still clear the binlog cache at ROLLBACK, or chop it at
ROLLBACK TO SAVEPOINT (meaning the SAVEPOINT command is also chopped, which
is fine).
Note that BUG#873 encompasses subbugs 1) and 2) of BUG#333 "3 binlogging bugs when doing INSERT with mixed InnoDB/MyISAM".
 2003-08-22 15:39:24 +02:00
monty@narttu.mysql.fi
5192a58140 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into narttu.mysql.fi:/my/mysql-4.0
 2003-08-22 04:08:16 +03:00
monty@narttu.mysql.fi
efa85aad49 Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files. 2003-08-22 04:07:40 +03:00
bar@bar.mysql.r18.ru
8c55440ba4 CAST(expr AS CHAR(10)) is now working 2003-08-21 14:15:25 +05:00
guilhem@mysql.com
ec280a51ca Result updates after Dmitri's and my changes to logging with --log-slave-updates. 
Since my changes, rpl_log.test, whose result file depends on file_id, became
non-repeatable, i.e. file_id on slave in SHOW BINLOG EVENTS
changed depending on the order of tests (sometimes 1, sometimes 5).
Which is logical: as now the slave does not copy Create_file and Exec_load from
the relay log (i.e from the master's binlog) to the slave's binlog, but
instead lets mysql_load() do the logging, the file_id is now the one whic
was used on the slave. Before it was the one which was used on the master,
and by chance the master was always restarted for this test because there's
a -master.opt file, so file_id on the master is always 1. But now file_id is
from the slave so we need to restart the slave. That's why I add an (empty)
-slave.opt file. I could have used 'server_stop/start slave', but this
would have required the manager, so most of the time mysql-test-run silently
skip the test which makes it useless. And I want this test to be run !
 2003-08-21 00:23:39 +02:00
bell@laptop.sanja.is.com.ua
63fc15ceeb merge 2003-08-21 00:41:08 +03:00
guilhem@mysql.com
f405287beb Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-08-20 23:25:58 +02:00
guilhem@mysql.com
1dd53ed073 First commit for fixing BUG#1100 
"LOAD DATA INFILE is badly filtered by binlog-*-db rules".
There will probably be a second final one to merge Dmitri's changes
to rpl_log.result and mine.
2 new tests:
rpl_loaddata_rule_m : test of logging of LOAD DATA INFILE when the master has binlog-*-db rules,
rpl_loaddata_rule_s : test of logging of LOAD DATA INFILE when the slave has binlog-*-db rules and --log-slave-updates.
 2003-08-20 23:24:45 +02:00
bell@laptop.sanja.is.com.ua
87bb62007b merge 2003-08-20 23:39:17 +03:00
bell@laptop.sanja.is.com.ua
c514948a30 merge 2003-08-20 22:17:57 +03:00
bell@laptop.sanja.is.com.ua
11af1f3c9c Merge 2003-08-20 17:45:04 +03:00
guilhem@gbichot2
8fb1d8c450 sleep instead of system sleep 2003-08-20 16:32:00 +02:00
dlenev@mysql.com
319017ae9f Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1086
 2003-08-20 17:25:45 +04:00
monty@narttu.mysql.fi
359846f052 Fixed some varnings from valgrind 
Set min value of max_allowed_packet to 1024
Fixed problem with UNION's without braces and SQL_CALC_FOUND_ROWS, LIMIT #,#
and ORDER BY...LIMIT
 2003-08-20 16:25:44 +03:00
Sinisa@sinisa.nasamreza.org
84c2e91f1e sql_union.cc: 
Fix for SQL_CALC_FOUND_ROWS in UNION's
 2003-08-20 16:14:01 +03:00
Sinisa@sinisa.nasamreza.org
5ed6551601 func_test.result, func_test.test: 
Test case for the LEAST() bug in LEFT JOIN
 2003-08-20 15:52:43 +03:00
Sinisa@sinisa.nasamreza.org
fb774125e8 item_func.h: 
Fix for a bug with LEAST() in WHERE clause
ha_innodb.cc:
  Fix for a configure bug
multi_update.result, multi_update.test:
  Fix for the update with NULL's in the result set
sql_update.cc:
  Fix for the update with NULL's in the result set
   Fix for the update with NULL's in the result set
   Fix for the update with NULL's in the result set
 2003-08-20 15:33:21 +03:00
dlenev@mysql.com
bb96092202 Fix for BUG#1086. Now we don't preserve event's log_pos through 
log-slave-updates since this causes unexpected values in 
Exec_master_log_pos in A->B->C replication setup, synchronization
 problems in master_pos_wait()... 
Still this brokes some functionality in sql/repl_failsafe.cc 
(but this file is not used now)
 2003-08-20 03:38:31 +04:00
bell@laptop.sanja.is.com.ua
dd9cbce47b merge 2003-08-19 20:14:35 +03:00
Sinisa@sinisa.nasamreza.org
be67e7176a Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
 2003-08-19 16:40:31 +03:00
Sinisa@sinisa.nasamreza.org
faabb1c42c A fix for a bug with long definition of SET or ENUM. 
Barkov approved it already
 2003-08-19 16:35:17 +03:00
monty@mashka.mysql.fi
0d01cc56bd Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-08-19 16:17:54 +03:00
monty@mashka.mysql.fi
ff63a5c3d9 Fix test case 2003-08-19 16:03:18 +03:00
monty@mashka.mysql.fi
eb6458cb18 After merge fixes + bugs from last merge 2003-08-19 16:00:12 +03:00
monty@mashka.mysql.fi
10c4acfb4f merge 2003-08-19 00:10:21 +03:00
monty@mashka.mysql.fi
4f7512160b After merge fixes 
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
 2003-08-19 00:08:08 +03:00
bell@laptop.sanja.is.com.ua
39a65cd777 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
 2003-08-18 01:56:31 +03:00
monty@mashka.mysql.fi
a9146ace70 Cleanups to recent patches 
Fix packet error when using wrong GRANT command
 2003-08-15 09:54:19 +03:00
bell@laptop.sanja.is.com.ua
e9e5faacfe Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0 
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
 2003-08-15 00:17:43 +03:00
monty@mashka.mysql.fi
fb47e64256 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-08-13 13:26:52 +03:00
bell@sanja.is.com.ua
758129279f Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
 2003-08-13 10:12:41 +03:00
bell@sanja.is.com.ua
6250e76381 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
 2003-08-12 23:45:53 +03:00
bell@sanja.is.com.ua
57bb575d49 fixed query cache intercommunication with innodb engine 2003-08-12 23:45:04 +03:00
bell@sanja.is.com.ua
341d5aa036 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
 2003-08-12 19:21:03 +03:00
bell@sanja.is.com.ua
f1b1f0d742 after merge fix 2003-08-12 18:51:49 +03:00
bell@sanja.is.com.ua
62849952df Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-having_resolve-4.1
 2003-08-12 18:44:48 +03:00
bell@sanja.is.com.ua
011d905391 merge 2003-08-12 17:48:58 +03:00
serg@serg.mylan
bc9f6cde50 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-08-12 15:30:47 +02:00
bell@sanja.is.com.ua
b6a8d68ae4 fixed problem with reference on derived table fields (BUG#1031) 2003-08-12 15:04:49 +03:00
bar@bar.mysql.r18.ru
e5e81f45a0 LIKE didn't work with non-default charset 2003-08-12 16:42:52 +05:00
bell@sanja.is.com.ua
6ac8e9b93c optimisation of independent ALL/ANY with aggregate function (WL#1115) (SCRUM) 2003-08-12 12:38:03 +03:00
monty@mashka.mysql.fi
7782286faf Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-08-12 01:33:55 +03:00
monty@mashka.mysql.fi
2263e3e51f Merge with 4.0.14 2003-08-11 22:44:43 +03:00
dlenev@mysql.com
c767f0b2a0 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-345
 2003-08-11 23:43:54 +04:00
dlenev@dlenev.mshome
921ac8af8b Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345) 2003-08-11 23:43:01 +04:00
bell@sanja.is.com.ua
b518e93b4a fixed collation of Item_cache family (BUG#951) 2003-08-11 20:48:51 +03:00
bar@bar.mysql.r18.ru
786af34146 Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a 
The above query created a field of koi8r charset, not cp1251

Change:
CREATE TABLE a (a CHAR(1) CHARACTER SET utf8) 
Length now means character length, not byte length.
The above creates a field that guarantees can store a multibyte value
1 character long. For utf8 the above creates a field that can store
3 bytes.
 2003-08-11 18:18:34 +05:00
bell@sanja.is.com.ua
cbb3a78d8d merge 2003-08-11 12:00:33 +03:00
bell@sanja.is.com.ua
71b39c3020 Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
 2003-08-11 11:57:37 +03:00
bell@sanja.is.com.ua
a0fda66f00 merge 2003-08-11 11:51:33 +03:00
monty@mashka.mysql.fi
2fb441fdf7 Remove wrong bug fix when calling create_sort_index. 
Fix possible replication bug with LOAD DATA ... IGNORE LINES #
 2003-08-10 05:14:16 +03:00
igor@rurik.mysql.com
994a1ea337 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2003-08-09 12:57:39 -07:00
bell@sanja.is.com.ua
da8ab7dd52 test for BUG#969 2003-08-09 17:10:58 +03:00
bell@sanja.is.com.ua
c66cc864e8 merge 2003-08-09 16:53:23 +03:00
bell@sanja.is.com.ua
87c60ca3d6 fixed union unlocking problem (BUG#906) 2003-08-09 14:39:54 +03:00
bell@sanja.is.com.ua
b41599de1c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-merged_qc-4.0
 2003-08-09 14:16:13 +03:00
serg@serg.mylan
083acc29bb BETWEEN bug fix: non-const expressions on both ends 2003-08-09 01:20:02 +02:00
bell@sanja.is.com.ua
ddd3ee8b27 rewritten test using loop (BUG#930) 
removed unused field (now it is in variables)
 2003-08-08 23:27:22 +03:00
serg@serg.mylan
df8b7799cb between range optimization bug (between with const on one end only) 2003-08-08 19:13:27 +02:00
serg@serg.mylan
f96d57d302 between tests added 
bugfixes will follow
 2003-08-08 18:49:22 +02:00
dlenev@build.mysql.com
38a5d1b70e Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into build.mysql.com:/users/dlenev/mysql-4.0-certs
 2003-08-08 15:03:42 +02:00
kostja@oak.local
765053c838 Merge oak.local:/home/kostja/mysql/mysql-4.1-root 
into oak.local:/home/kostja/mysql/mysql-4.1
 2003-08-07 22:19:42 +04:00