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

2688 commits

Author SHA1 Message Date
monty@mysql.com
4f42a47408 Fixed range optimzier bug (Bug #1828) 2003-11-28 15:45:34 +02:00
monty@mysql.com
8e613176b5 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/my/mysql-4.1
 2003-11-28 14:47:33 +02:00
serg@serg.mylan
3b49d34f97 merged 2003-11-28 12:49:58 +01:00
serg@serg.mylan
16e5b4f0ba bug #1945. item(expression)->name=0, crash in find_item_in_list 2003-11-28 12:36:45 +01:00
monty@mysql.com
7f9466a717 Merge 2003-11-28 13:31:38 +02:00
monty@mysql.com
ede8169d24 Added missing SSL library (Should be in source distribution) 
Fixed compiler warnings (a lot of hidden variables detected by the Forte compiler)
Added a lot of 'version_xxx' strings to 'show variables'
Prevent copying of TMP_TABLE_PARAM (This caused core dump bug on Solaris)
Fixed problem with printing sub selects to debug log
 2003-11-28 12:18:13 +02:00
bell@sanja.is.com.ua
bd0aef2df3 code coverage for UNIONs 2003-11-27 19:45:28 +02:00
guilhem@mysql.com
292b0a1892 Fix for BUG#1960 "date_format() returns spurious '-' for valid dates". 
It was a forgotten ltime->neg=0 (neg was the only forgotten variable).
I scanned field.cc for other places where we would forget to set neg, found none.
A test for the bug.
 2003-11-26 17:06:24 +01:00
bell@sanja.is.com.ua
2fb65b4def 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-11-25 23:56:54 +02:00
bell@sanja.is.com.ua
5474ada47a added collation processing in UNION merging 
temporary table BLOB now is longblob
 2003-11-25 23:52:10 +02:00
serg@serg.mylan
34fdd54e07 post-merge fixes 2003-11-25 20:06:41 +01:00
serg@serg.mylan
bff0bbeb1f merged 2003-11-25 18:26:53 +01:00
serg@serg.mylan
e267163612 mysql-test-run fixes: 
libexec support in install_test_db
--start-from in mysql-test-run
 2003-11-25 14:43:15 +01:00
Sinisa@sinisa.nasamreza.org
94a298466c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
 2003-11-24 15:49:35 +02:00
monty@mysql.com
f074511529 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/my/mysql-4.1
 2003-11-24 09:46:11 +02:00
bell@sanja.is.com.ua
675186d816 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-11-23 21:27:48 +02:00
bell@sanja.is.com.ua
afe48d3ce4 after review fixes 2003-11-23 21:26:43 +02:00
monty@mysql.com
5dca5c7d53 Fix test for binary builds 2003-11-23 21:03:10 +02:00
guilhem@gbichot2
05e5a35bf2 Replication: 
Now the I/O thread (in flush_master_info()) flushes the relay log to disk
after reading every event. Slower but provides additionnal safety in case
of brutal crash.
I had to make the flush optional (i.e. add a if(some_bool_argument) in the function)
because sometimes flush_master_info() is called when there is no usable
relay log (the relay log's IO_CACHE is not initialized so can't be flushed).
 2003-11-23 17:02:59 +01:00
bell@sanja.is.com.ua
9fbf629cdc 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-11-23 17:59:28 +02:00
monty@mysql.com
05f1e10030 merge with 4.0 2003-11-23 14:52:02 +02:00
monty@mysql.com
7c725b2486 Fixed compiler warnings from Intel compiler in Win64 
Added option --max-record-length=# to myisamchk
Don't try repair twice if doing myisamchk --repair --force
Shared memory handler didn't clean up things on errors or shutdown
 2003-11-23 14:36:41 +02:00
bell@sanja.is.com.ua
7191ea0ae3 Fixed UNION fields type/length detecting 2003-11-23 02:01:15 +02:00
monty@mysql.com
d87494c5ac Don't flush cur_log (relay log) on flush_relay_log_info becasue this crashes the server if cur_log is 'hot' and the io_thread has changed log file. 
Updated project files for windows
Made rpl_change_master.test portable
Ensure that mutex are not freed if not initilized
 2003-11-22 03:21:40 +02:00
monty@mysql.com
d08945498e Fixed memory leak with RAID tables 
Fixed tests for RAID tables
Detect uninitialized mutexes on lock and destroy
 2003-11-21 14:41:57 +02:00
hf@deer.(none)
eb08458c55 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into deer.(none):/home/hf/work/mysql-4.1.1727
 2003-11-21 11:58:28 +04:00
paul@ice.snake.net
0a5af44480 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1 
into ice.snake.net:/Users/paul/mysql-4.1
 2003-11-20 21:16:45 -06:00
monty@mysql.com
8aeb63dd3b Update VC++ files 
Portability fixes
After merge fixes
 2003-11-21 01:53:01 +02:00
serg@serg.mylan
5443cba38e Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-11-20 23:25:59 +01:00
monty@mysql.com
32a62d5069 Merge with 4.0 to revert patch for BIGINT assignment to double 2003-11-21 00:17:46 +02:00
serg@serg.mylan
8ca1836207 yet another trunc* bug 2003-11-20 23:15:07 +01:00
monty@mysql.com
41eda1c949 Revert patch for bigint handling in double context as it broke normal bigint handling 
The right way to fix this is to change the Field::store(longlong) method to be
Field::store(longlong, bool unsigned_flag), but this is better to do in 4.1 than in 4.0
 2003-11-21 00:11:50 +02:00
serg@serg.mylan
cb235f43c9 Merge 2003-11-20 23:07:31 +01:00
serg@sergbook.mylan
55182340ba more left join tests 2003-11-20 22:20:54 +01:00
konstantin@mysql.com
c4a9dc4f8b fix for bug #1790: 
"BIT_AND() result in GROUP BY different when SQL_BIG_RESULT used"

return value of BIT_AND changed to BIGINT SIGNED
Also the patch fixes another bug: when temporary table is in use and one of
values in group is NULL, BIT_AND always returns zero.
Fixed it to always skip null values.
 2003-11-21 00:03:04 +03:00
monty@mysql.com
b01fcb4e14 Merge with 4.0 to get: 
Fix for storing negative values in decimal fields
Fix for FLUSH TABLE with HANDLER
 2003-11-20 22:30:48 +02:00
monty@mysql.com
7c6113a39f Merge key cache structures to one 
Fixed compiler warnings (IRIX C compiler and VC++)
 2003-11-20 22:06:25 +02:00
paul@ice.snake.net
4909a37eac Use same style for SHOW MASTER STATUS fields as 
for SHOW SLAVE STATUS.
 2003-11-20 13:49:05 -06:00
paul@ice.snake.net
53c93091f2 Write slave status field names using consistent style. 
(Initial caps for each word.) For example, instead of writing
Until_condition, Until_Log_File, and Until_log_pos, write
Until_Condition, Until_Log_File, and Until_Log_pos.
 2003-11-20 13:07:25 -06:00
paul@ice.snake.net
ee46b6909c Typo. 2003-11-20 12:55:07 -06:00
bell@sanja.is.com.ua
a1ceb1bd04 database invalidation invalidate queries only of given database (BUG#1898) 2003-11-20 18:12:49 +02:00
guilhem@mysql.com
a684227c4a Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1
 2003-11-19 23:40:59 +01:00
guilhem@gbichot2
4bd3b096a0 Official builds are tested with mysql-test-run --sleep=10, and the slave 
has (in mysql-test-run) a slave-net-timeout=10. So the 'sleep 1' below
was converted in 'sleep 10', so slave thought that connection was down,
so reconnected, so got an additional (fake) Rotate event, which shifted
the positions displayed by SHOW SLAVE STATUS.
 2003-11-19 23:39:08 +01:00
serg@serg.mylan
707e7e8992 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-11-19 23:13:48 +01:00
serg@serg.mylan
11f70bdfc4 Bug#1826, HANDLER+ALTER TABLE=crash (unfortunately, it cannot be tested in mysql-test suite) 
more user variable tests
 2003-11-18 22:06:47 +01:00
lenz@mysql.com
8ab3160d7e Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2003-11-18 21:23:41 +01:00
lenz@kallisto.local
d2295c2c52 - fixed typo in mysql-test-run error message 2003-11-18 21:04:36 +01:00
bell@sanja.is.com.ua
8ed7ab1fe0 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-delete-4.1
 2003-11-18 19:32:59 +02:00
monty@mashka.mysql.fi
a47d56088f Merge with 4.0 tree 2003-11-18 18:54:27 +02:00
guilhem@mysql.com
a780924979 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-11-18 17:36:09 +01:00
guilhem@mysql.com
8377acc7d1 Fix for BUG#1870 
"CHANGE MASTER makes SQL thread restart from coordinates of I/O thread".
    So, in CHANGE MASTER:
    when it seems reasonable that the user did not want to discontinue
    its replication (i.e. when he is not specifying host or port or master_log_file
    or master_log_pos; this will be documented), set the coordinates of the
    I/O thread to those of the SQL thread. This way, the SQL thread will see
    no discontinuity in the relay log (i.e. will skip no events), because
    the I/O thread will fill the brand new relay log with the events which
    are just after the position where the SQL thread had stopped
    (before CHANGE MASTER was issued).
    And a new test for this bug.
 2003-11-18 17:31:17 +01:00
bell@sanja.is.com.ua
d96b3aa939 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-delete-4.1
 2003-11-18 17:48:45 +02:00
monty@mashka.mysql.fi
b60aea4058 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2003-11-18 17:28:33 +02:00
monty@mashka.mysql.fi
c9ae785bc3 Delete duplicate error message names 2003-11-18 17:28:00 +02:00
sergefp@mysql.com
6c5b4af81c Fix for bug #1820 2003-11-18 17:04:52 +03:00
Sinisa@sinisa.nasamreza.org
f6ca9afdbd Fix for bug when zeros are to be prepended to decimal field 2003-11-18 15:58:27 +02:00
monty@mashka.mysql.fi
e5d75fb984 merge 2003-11-18 13:51:48 +02:00
monty@mashka.mysql.fi
cab1dc628c CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS 
New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET  ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.
 2003-11-18 13:47:27 +02:00
serg@serg.mylan
6d350964dc word substitution in error messages removed - can create problems for i18n 2003-11-18 10:23:49 +01:00
serg@serg.mylan
249c0f9b32 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-11-17 21:51:57 +01:00
bell@sanja.is.com.ua
5327ec1d09 IGNORE option was added for DELETE statement (WL#1334) 2003-11-17 22:45:07 +02:00
gluh@gluh.mysql.r18.ru
74165e729c Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.lastday
 2003-11-17 18:02:47 +04:00
gluh@gluh.mysql.r18.ru
5ade64831e WL#1253: LAST_DAY 2003-11-17 18:02:08 +04:00
serg@serg.mylan
60d60a299e Item_uint::save_in_field() added to take into account bigint->decimal case 2003-11-16 17:37:15 +01:00
bell@sanja.is.com.ua
2cb4abb5a7 fixed error handling inside su_select() for multidelete 
(BUG#1839)
 2003-11-15 21:52:21 +02:00
serg@serg.mylan
01e1161676 cleanup 2003-11-15 12:30:32 +01:00
serg@serg.mylan
f4d7afd213 multiple keycache fixes 2003-11-13 14:31:29 +01:00
gluh@gluh.mysql.r18.ru
e78f51fbe9 Fix for bug #1564: CREATE TABLE + UNION + same table name = crash 2003-11-11 18:14:49 +04:00
serg@sergbook.mylan
a1199c7749 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into sergbook.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-11-08 16:00:00 +01:00
serg@sergbook.mylan
cdd8a2a9a5 fulltext.test, fulltext.result, ft_nlq_search.c: 
a bug in latin1_german2 FT fixed
 2003-11-08 15:41:24 +01:00
serg@sergbook.mylan
05b3ff393f fulltext.test, fulltext.result: 
one simple trunc* test
 2003-11-08 15:39:10 +01:00
hf@deer.(none)
a88f4ea30f Fix for bug #1727 ( Crash in EXPLAIN & UNION & derived) 
another version of the fix.
Here i removed a loop that seems to be superfluous
 2003-11-08 16:43:16 +04:00
bell@sanja.is.com.ua
ec9fa02b12 sunstring_index() code covarage 
print() method code covarage for some string function which I lost last time
 2003-11-07 09:43:24 +02:00
bell@sanja.is.com.ua
c7bc56f392 fixed printability of gis functions 
code covarage for srid, GeomFromText with 2 parameters
code covarage foe print() method of gis functions
 2003-11-06 21:03:11 +02:00
ram@gw.mysql.r18.ru
f277c9f88a Portability fix (for example NetWare doesn't support table name like t"1"). 2003-11-05 12:06:03 +04:00
monty@mysql.com
6622d6f8cd Fixed access to uninitialized memory in protocol::store_time 2003-11-04 14:59:38 +02:00
monty@narttu.mysql.fi
f763d4c31d Removed some warnings reported by valgrind 
After merge fixes.
Now code compiles, but there is still some valgrind warnings that needs to be fixed
 2003-11-04 14:09:03 +02:00
konstantin@mysql.com
8748cf96eb Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/kostja/mysql/mysql-4.0-root
 2003-11-04 12:55:39 +03:00
konstantin@mysql.com
4eb255e60e Word Police law is abided 2003-11-04 12:38:09 +03:00
monty@narttu.mysql.fi
4e4725377d Merge with 4.0 2003-11-04 09:40:36 +02:00
serg@serg.mylan
e1e82a4e00 Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-11-03 23:19:20 +01:00
serg@serg.mylan
5505abe102 fixed a bug in boolean fts where a word queue was created based on min_word_len, while with trunc* operator one could get shorter words 2003-11-03 23:18:55 +01:00
monty@narttu.mysql.fi
6b79cd5c23 Merge 2003-11-03 22:48:03 +02:00
monty@narttu.mysql.fi
085b1c5608 Some simple things missing for last changeset 2003-11-03 22:18:16 +02:00
konstantin@mysql.com
2aff1b520b Merge mysql.com:/home/kostja/mysql/mysql-4.0-root 
into mysql.com:/home/kostja/mysql/mysql-4.0-1724
 2003-11-03 22:53:42 +03:00
bell@sanja.is.com.ua
dde384d9ea Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-print_subselect-4.1
 2003-11-03 20:43:21 +02:00
guilhem@mysql.com
19c2162bdc Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-11-03 18:25:47 +01:00
guilhem@mysql.com
fbc54c139d When we delete the slave's temp tables from memory, we reset 
rli->save_temporary_tables and slave_open_temp_tables
(in old 4.0 you could make "SHOW STATUS LIKE 'slave_open_temp_tables'" grow
indefinitely by doing RESET SLAVE and replicating always the same CREATE
TEMPORARY TABLE).
It's critical to reset save_temporary_tables to 0 (otherwise you may later
read memory which has been freed) so this changeset should go into 4.1.
 2003-11-03 18:24:01 +01:00
konstantin@mysql.com
0143e48568 fix for bug #1724 'WHERE ... IN() optimizer behaviour 
has changed since 4.0.14'
We need to calculate cost of RANGE
scan if it is present instead of cost of 
FULL scan.
 2003-11-03 19:56:01 +03:00
ram@gw.mysql.r18.ru
3dba5c6cc1 WL #1279: Add table description to xml dump 
changes after montys review
 2003-11-03 16:49:39 +04:00
monty@narttu.mysql.fi
a444a3449f Simplified 'wrong xxx name' error messages by introducing 'general' ER_WRONG_NAME error 
Cleaned up (and disabled part of) date/time/datetime format patch. One can't anymore change default read/write date/time/formats.
This is becasue the non standard datetime formats can't be compared as strings and MySQL does still a lot of datetime comparisons as strings
Changed flag argument to str_to_TIME() and get_date() from bool to uint
Removed THD from str_to_xxxx functions and Item class.
Fixed core dump when doing --print-defaults
Move some common string functions to strfunc.cc
Dates as strings are now of type my_charset_bin instead of default_charset()
Introduce IDENT_QUOTED to not have to create an extra copy of simple identifiers (all chars < 128)
Removed xxx_FORMAT_TYPE enums and replaced them with the old TIMESTAMP_xxx enums
Renamed some TIMESTAMP_xxx enums to more appropriate names
Use defines instead of integers for date/time/datetime string lengths
Added to build system and use the new my_strtoll10() function.
 2003-11-03 14:01:59 +02:00
bell@sanja.is.com.ua
c56e75e2c1 after review fix 2003-11-03 12:28:36 +02:00
bell@sanja.is.com.ua
e025adb403 Merge 2003-11-03 08:47:27 +02:00
bell@sanja.is.com.ua
abfa5514e4 merge 2003-11-02 17:29:31 +02:00
bell@sanja.is.com.ua
777316c3e1 fixed BUG#1645 
all calls of fix_fields() are inspected
(copy of cset which I lost in accidatly tree delete)
 2003-11-02 17:27:35 +02:00
bell@sanja.is.com.ua
8e80431f8c aftermerge fix 2003-11-02 17:21:32 +02:00
bell@sanja.is.com.ua
74ddfaadda after review fix 2003-11-02 16:56:39 +02:00
bell@sanja.is.com.ua
42fb7d1c07 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1
 2003-11-02 16:35:38 +02:00
monty@mysql.com
306ffd74b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/my/mysql-4.0
 2003-11-02 15:55:25 +02:00
monty@mysql.com
4668b54837 Call my_sync() after all data is written to .frm file 
Added my_sync() to mysys which will do fsync/fdatasync/_commit() on a file.
 2003-11-02 15:55:02 +02:00
bell@sanja.is.com.ua
d98487ac20 merge 2003-11-02 15:52:40 +02:00
bell@sanja.is.com.ua
e0ff4138a5 BUG#1708 & other subselects with innodb tests 2003-11-02 14:43:11 +02:00
bell@sanja.is.com.ua
532a6f2264 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-like-4.1
 2003-11-02 14:02:14 +02:00
monty@mysql.com
cf535556c6 Cleanups (comments and compiler warnings) 
dded init of variable to fix core dump on startup errors
 2003-11-02 14:00:25 +02:00
bell@sanja.is.com.ua
e32a1c923a fixed locking problem with innodb & subqueries (BUG#1708) 
tests with innodb moved to separate file
 2003-11-02 13:53:38 +02:00
guilhem@mysql.com
c1f7f33960 4 small items in this: 
- when we don't have in_addr_t, use uint32.
- a forgotten initialization of slave_proxy_id in sql/log_event.cc (was not really "forgot", was
"we needn't init it there", but there was one case where we needed...).
- made slave_proxy_id always meaningful in THD and Log_event, so we can
rely more on it (no need to test if it's meaningful). THD::slave_proxy_id
is equal to THD::thread_id except for the slave SQL thread.
- clean up the slave's temporary table (i.e. free their memory) when slave
server shuts down.
 2003-10-31 23:20:23 +01:00
bell@sanja.is.com.ua
dba82596aa merge 2003-10-31 23:03:27 +02:00
vva@eagle.mysql.r18.ru
9c7b1cf8ea fixed bug #1688 "CREATE TABLE ... SELECT with default()" 2003-10-31 16:24:55 -04:00
bell@sanja.is.com.ua
0747324ede merge 2003-10-31 22:14:49 +02:00
serg@serg.mylan
b1f5a03685 Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-10-31 14:25:38 +01:00
ram@gw.mysql.r18.ru
de9d246548 Fixes for mysql tests. 2003-10-31 16:37:36 +04:00
bell@sanja.is.com.ua
101a9f0180 new test 2003-10-31 11:52:46 +02:00
bell@sanja.is.com.ua
5ad2f38f5d amall fix 2003-10-31 11:52:01 +02:00
serg@serg.mylan
74551a72ec Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-10-31 10:34:34 +01:00
ram@gw.mysql.r18.ru
c5b481d99a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.wl1056
 2003-10-31 13:03:12 +04:00
ram@gw.mysql.r18.ru
90ffe1be00 WL #1056: Eliminate NOT operators from where condition 2003-10-31 13:02:16 +04:00
ram@gw.mysql.r18.ru
906ad716cc new mysqldump -X test (bug #1707) 2003-10-31 11:29:57 +04:00
serg@serg.mylan
e5d6035188 post-merge fixes 2003-10-30 21:04:09 +01:00
igor@rurik.mysql.com
f29ed57531 Merge 2003-10-30 10:45:28 -08:00
serg@serg.mylan
54f9d44b7f merged 2003-10-30 19:26:57 +01:00
guilhem@mysql.com
b99fd4beca Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0 
into mysql.com:/home/mysql_src/mysql-4.0
 2003-10-30 16:13:38 +01:00
guilhem@mysql.com
80793657b4 Fix to be able to run 
mysql-test-run --manager --valgrind
(without this fix, the manager fails to start mysqld and the tests hang).
 2003-10-30 16:12:21 +01:00
bell@sanja.is.com.ua
33346e26af added code covarage for functions convert(), nullif(), crc32(), is_used_lock(), char_lengtrh(), bit_xor() 
added string length for more speed
made code covarage for print() method of Item
fixed printability of some items (SCRUM) (WL#1274)
 2003-10-30 12:57:26 +02:00
guilhem@mysql.com
59d0872aa0 Fix for BUG#1686 
"If 2 master threads with same-name temp table, slave makes bad binlog"
and (two birds with one stone) for
BUG#1240 "slave of slave breaks when STOP SLAVE was issud on parent slave
and temp tables".

Here is the design change:
in a slave running with --log-slave-updates, events are now logged with the
thread id they had on the master. So no more id conflicts between master threads,
but introduces id conflicts between one master thread and one normal 
client thread connected to the slave. This is solved by storing the server id
in the temp table's name.

New test which requires mysql-test-run to be run with --manager,
otherwise it will be skipped.

Undoing a Monty's change (hum, a chill runs down my spine ;) which was
"Cleanup temporary tables when slave ends" in ChangeSet 1.1572.1.1.
 2003-10-29 14:23:35 +01:00
bell@sanja.is.com.ua
ae380c5855 merge 2003-10-28 12:45:37 +02:00
bell@sanja.is.com.ua
2efab5b67d fixed ALL/ANY optimisation with union (BUG#1668) 
code cleanup
 2003-10-27 01:01:27 +02:00
bell@sanja.is.com.ua
c43ac24bf7 after-merge fix 2003-10-26 22:01:00 +02:00
bell@sanja.is.com.ua
393838ad61 merge 2003-10-26 19:38:41 +02:00
serg@serg.mylan
8cdc27da15 Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1-bug 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-10-25 00:03:44 +02:00
serg@serg.mylan
6e17f4f20d fixes to Bitmap class 2003-10-24 22:44:48 +02:00
bell@sanja.is.com.ua
caa9645c24 Merge 2003-10-24 19:42:39 +03:00
bell@sanja.is.com.ua
f349adf8de support 'parallel' updates and rallback of whole statement in case of error in evalueting value which should be assigned 
(BUG#1484)
 2003-10-24 17:28:32 +03:00
serg@serg.mylan
944570970d Merge bk-internal:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2003-10-23 23:11:33 +02:00
bell@sanja.is.com.ua
6457b89948 added check of cardinality to IN/ALL/ANY subquery transformer 
(BUG#1638)
 2003-10-23 23:54:21 +03:00
bell@sanja.is.com.ua
4e1920762a Merge 2003-10-23 23:06:43 +03:00
bell@sanja.is.com.ua
faea7e0144 Merge 2003-10-23 21:26:06 +03:00
bell@sanja.is.com.ua
5fb30467ee Merge 2003-10-23 21:09:40 +03:00
serg@serg.mylan
b820d2a347 query expansion for fulltext search 2003-10-23 15:21:06 +02:00
monty@narttu.mysql.fi
eaf9f35db8 Fix results after merge 2003-10-23 14:04:06 +03:00
monty@narttu.mysql.fi
12009f5d04 Merge with 3.23 to get 4.0 tree in sync (no relevant changes to 4.0 tree) 2003-10-23 13:25:16 +03:00
bell@sanja.is.com.ua
934fa2a104 Merge 2003-10-22 20:52:47 +03:00
serg@serg.mylan
df69309593 MATCH ... AGAINST ("..." WITH QUERY EXPANSION) syntax 2003-10-22 17:57:09 +02:00
gluh@gluh.mysql.r18.ru
f602be8d3f Fix for bug #1271: Undefined variable in PASSWORD() function is not 
handled correctly
 2003-10-21 15:14:06 +05:00
serg@serg.mylan
f944fd4a65 merged 2003-10-21 11:58:43 +02:00
bell@sanja.is.com.ua
282b402813 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-count-4.1
 2003-10-20 18:18:18 +03:00
bar@bar.mysql.r18.ru
e0444dc3be Test for bug #1022 
Description: When a table contains a 'float' field, and one of the functions
MAX, MIN, or AVG is used on that field, the system crashes.
 2003-10-20 19:13:45 +05:00
serg@serg.mylan
c60ef8160f FULLTEXT: correct charset support (UTF included, UCS2 - not) 
code cleanup
 2003-10-20 15:53:48 +02:00
gluh@gluh.mysql.r18.ru
4bed4abb62 Merge commit 2003-10-20 13:45:28 +05:00
gluh@gluh.mysql.r18.ru
62b0b8b800 Scrum task 835 - text-to-datetime conversion function 2003-10-20 13:24:18 +05:00
bell@sanja.is.com.ua
9d294b869e correct table name assigned to temporary table field: 
- correct table name shown in EXPLAIN Iindex reference)
 - pointer on freed memmory (reallocation of table name in reusing table entry) can't be used in EXPLAIN
(BUG#1584)
 2003-10-19 14:25:33 +03:00
bell@sanja.is.com.ua
1db5484577 index name shown (SCRUM) (WL#1274) 2003-10-19 14:22:17 +03:00
bell@sanja.is.com.ua
2586a56be5 fixed deleting derived table tree after using (BUG#1536) 2003-10-17 15:18:57 +03:00
lenz@mysql.com
095db2746e - Updated rpl_trunc_binlog test result after last change 2003-10-17 02:32:09 +02:00
guilhem@mysql.com
ce6d736714 A fix for a random test failure rpl_trunc_binlog: don't RESET MASTER 
while the slave is connected.
 2003-10-17 00:00:25 +02:00
bell@sanja.is.com.ua
b9dccb34dd fixed support of used_tables() and const_item() in subqueries 
(BUG#1444)
 2003-10-17 00:36:01 +03:00
vva@eagle.mysql.r18.ru
1692d2de15 fixed sqlstate for ER_WRONG_INDEX_NAME 
removed unnesessary code from create.test
 2003-10-16 16:15:45 -04:00
bell@sanja.is.com.ua
857b7a80a3 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc_crash-4.0
 2003-10-16 21:17:45 +03:00
vva@eagle.mysql.r18.ru
c74da8bbd7 added checking for empty index name (fixed bug #1419) 2003-10-16 11:33:44 -04:00
bell@sanja.is.com.ua
a7bdd19707 subqueries made printable 
new EXPLAIN parameter to show real query as it was interpreted
(SCRUM) (WL#1274)
 2003-10-16 15:54:47 +03:00
monty@mashka.mysql.fi
6ad94a6d57 Fix test after merge 2003-10-16 08:34:17 +03:00
monty@mashka.mysql.fi
a3707408e8 Update results after merge 2003-10-16 08:16:39 +03:00
monty@mashka.mysql.fi
e87c9f5ff8 merge with 4.0 2003-10-16 03:08:40 +03:00
monty@mashka.mysql.fi
0d34e50f39 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mashka.mysql.fi:/home/my/mysql-4.1
 2003-10-15 22:52:31 +03:00
monty@mashka.mysql.fi
9ef2a83fbe Portability fixes for windows 
After merge fixes
 2003-10-15 22:40:36 +03:00
monty@mashka.mysql.fi
84d9d98078 Better fix for CREATE TABLE IF NOT EXISTS ... SELECT 
Fixed chsize() problem on windows
Extend default timeout on windows clients to 1 year (to avoid timeout problems)
 2003-10-15 21:41:13 +03:00
monty@mashka.mysql.fi
35c09b8082 Merge bk-internal.mysql.com:/home/bk/mysql-4.0 
into mashka.mysql.fi:/home/my/mysql-4.0
 2003-10-15 16:23:01 +03:00
serg@serg.mylan
50c8b7c13b stricter checks on FULLTEXT index creating 2003-10-15 13:40:20 +02:00
serg@serg.mylan
50d9b95b77 merged 2003-10-15 12:25:44 +02:00
gluh@gluh.mysql.r18.ru
9c2867c2d4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.max
 2003-10-15 14:51:56 +05:00
gluh@gluh.mysql.r18.ru
9e401712a0 WL#1106: Switch = --maxdb rather than --sapdb 2003-10-15 14:50:36 +05:00
serg@serg.mylan
5742f29a01 "phrase search" should not match partial words (it should not match 'paraphrase searches') 2003-10-14 16:19:13 +02:00
monty@mashka.mysql.fi
e71b53a8fe merge with 4.0 to get fix for SET enum_system_variable=NULL 2003-10-14 16:34:09 +03:00
monty@mashka.mysql.fi
2d3840f550 Fixed bug in SET enum_system_variable=NULL 2003-10-14 16:30:42 +03:00
serg@serg.mylan
f3e7012d6e Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2003-10-14 00:27:04 +02:00
monty@mashka.mysql.fi
461d1627b3 merge with 4.0 for more memory allocation variables. 2003-10-13 15:50:30 +03:00
bell@sanja.is.com.ua
628d2e4a7c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-group_concat-4.1
 2003-10-13 09:49:47 +03:00
serg@serg.mylan
32fed1e877 wrong ER_TOO_BIG_FOR_UNCOMPRESS error in UNCOMPRESS() fixed. 
typo in error message text corrected.
new tests added
 2003-10-12 15:16:45 +02:00
bell@laptop.sanja.is.com.ua
8f5c3f3981 fixed fix_fields() parameters for GROUP_CONCAT() ORDER BY clause 
(BUG#1537)
 2003-10-12 16:10:40 +03:00
monty@mashka.mysql.fi
c60a75e9ba Add warnings for single line inserts. To do this I had to convert count_cuted_fields to an enum (to be able to detect setting a NOT NULL field to NULL) 2003-10-11 23:26:39 +03:00
monty@mashka.mysql.fi
c95d142f8f Add new user variables for tuning memory usage: 
query_alloc_block_size, query_prealloc_size, range_alloc_block_size,transaction_alloc_block_size and transaction_prealloc_size
Add more checks for "out of memory" detection in range optimization
 2003-10-11 22:00:24 +03:00
bell@laptop.sanja.is.com.ua
fa5520fbf8 more resonable errors about name resolving in subqueries (BUG#1483) 2003-10-11 17:41:15 +03:00
bell@laptop.sanja.is.com.ua
99fe76453e samall optimisation (any independent query will not save data for rexecution) 
saving/restoring join_tab array (to save it of chnging by create_sort_index() before reexecuting)
(BUG#1523)
 2003-10-10 21:49:48 +03:00
dlenev@dlenev.mshome
8313e0da03 Fix for rpl_openssl test (there was extra spaces in result file) 2003-10-10 17:06:18 +04:00
guilhem@gbichot2
d6d6c5e1bb Don't show Slave_IO_State in the testsuite (replace it with #) because it can't be predicted. 
I manually edited rpl_openssl.result because the test is skipped on my
machine. Hope it's correct.
 2003-10-09 18:16:15 +02:00
bell@laptop.sanja.is.com.ua
200eb65df7 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-09 09:30:26 +03:00
bell@laptop.sanja.is.com.ua
b5aeed824f merge 2003-10-09 09:20:01 +03:00
guilhem@gbichot2
c0075fa64b Final push for WL#1098: 
"Add a column "Timestamp_of_last_master_event_executed" in SHOW SLAVE STATUS".
Finally this is adding
- Slave_IO_State (a copy of the State column of SHOW PROCESSLIST for the I/O thread,
so that the users, most of the time, has enough info with only SHOW SLAVE STATUS).
- Seconds_behind_master. When the slave connects to the master it does SELECT UNIX_TIMESTAMP()
on the master, computes the absolute difference between the master's and the slave's clock.
It records the timestamp of the last event executed by the SQL thread, and does a
small computation to find the number of seconds by which the slave is late.
 2003-10-09 00:06:21 +02:00
vva@eagle.mysql.r18.ru
6f96749cca fixed temp directory for mysqlbinlog (was wrong on solaris) 2003-10-08 17:15:59 -04:00
bell@laptop.sanja.is.com.ua
f836a796c4 added worning about changing requested size of query cache (BUG#1502) 2003-10-09 00:13:15 +03:00
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