Commit graph

10190 commits

Author SHA1 Message Date
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
heikki@hundin.mysql.fi
1796d50df3 Many files:
Merge with ibbackup; bug fix: .ibd files were extended 2 x the required amount; InnoDB does not create the small file inno_arch_log... any more at database creation
2003-11-03 19:11:09 +02: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
06161760ce Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.wl1279
2003-11-03 17:37:15 +04:00
serg@serg.mylan
bda251c37a compatibility fixes 2003-11-03 13:55:25 +01: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
414478f397 after review fix 2003-11-03 13:44:23 +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
monty@narttu.mysql.fi
3ebe794733 Portability fix 2003-11-02 16:38:27 +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
bell@sanja.is.com.ua
33f6f72979 join_free now is method of JOIN and commented
dependence should mean uncacheability
2003-11-02 16:31:22 +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
f66d074403 Merge of key_map fix (used my fix as it was more general) 2003-11-02 14:02:13 +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
bell@sanja.is.com.ua
cac0c0ae6e key_map is class for now => can't be printed directly
(found during BUG#1708 investigation)
2003-11-01 21:05:17 +02:00
bell@sanja.is.com.ua
3e10f80682 fixed part of BUG#1708
(test suite will be with next part)
2003-11-01 19:02:43 +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
bell@sanja.is.com.ua
0747324ede merge 2003-10-31 22:14:49 +02:00
serg@serg.mylan
d1bfa5c598 small fix for max_user_connections. everything else will be pulled from 4.0 2003-10-31 15:53:54 +01:00
konstantin@oak.local
e3bf30fdfb follow-up to Sanja fix:
fix_fields() never accepts (THD *)(0)
2003-10-31 17:52:00 +03:00
serg@serg.mylan
13b5f71844 post-merge fixes 2003-10-31 15:49:59 +01:00
konstantin@mysql.com
975177fdb2 minor fix in rm 2003-10-31 17:13:42 +03:00
konstantin@mysql.com
f9015d5ac8 thd->query assignment moved out
of lock scope
2003-10-31 17:03:08 +03: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
konstantin@mysql.com
35fe0d898d Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-10-31 15:42:27 +03:00
ram@gw.mysql.r18.ru
de9d246548 Fixes for mysql tests. 2003-10-31 16:37:36 +04:00
konstantin@oak.local
d4cc4a3ca1 old_total_warn_count is not used
and was removed from THD
2003-10-31 15:15:13 +03: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
ram@gw.mysql.r18.ru
14742557f4 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.wl1279
2003-10-31 11:17:12 +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
konstantin@mysql.com
2ec94ade8f Merge kosipov@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/kostja/mysql/mysql-4.0-root
2003-10-30 21:31:15 +03:00