Commit graph

2285 commits

Author SHA1 Message Date
Sinisa@sinisa.nasamreza.org
ba029973fa null.result, null.test:
Fix for a bug #2219, regarding a bad cast to integer from NULL
item_func.h:
  Fix for a bug #2219, regarding a bad cast to integer from NULL
sql_parse.cc:
  A fix for a bug #2207, with mysql server haning on option setting
2004-01-09 22:28:29 +02:00
monty@mysql.com
f784f54c9c Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
2004-01-09 12:40:09 +01:00
ram@gw.mysql.r18.ru
8178bd4ec8 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2231
2004-01-09 11:15:14 +04:00
ram@gw.mysql.r18.ru
75df017276 An improvement of the fix for the bug #2231: string column,
INDEX+LIKE, don't take the ESCAPE character. (ver. 2)
2004-01-08 12:24:36 +04:00
bell@sanja.is.com.ua
501ae0bc52 allow UPDATE and DELETE stetements with tables derived from subquery if they are not updated (BUG#2117)
allow delete table by alias in multi-delete statement
2004-01-04 23:44:33 +02:00
bar@bar.intranet.mysql.r18.ru
39559d4817 #2244 User variables collation conflict is not detected 2003-12-31 19:01:03 +04:00
ram@gw.mysql.r18.ru
e49c7ae45f Fix for the bug #2231: string column, INDEX+LIKE, don't take the ESCAPE character.
(acctually i don't like the fix, any suggestions?)
2003-12-30 19:23:38 +04:00
monty@mysql.com
2ea2d15749 Merge 2003-12-30 13:16:49 +02:00
monty@mysql.com
c1dd070ba7 Some small portability fixes.
Added support for lower_case_table_names=2, which is to be used on case insensitive file systems.
This tells MySQL to preserve the used case of filenames and database names to make it esier to move files between cases sensitive can case insensitive file systems (like Windows and Linux)
2003-12-30 13:14:21 +02:00
monty@mysql.com
8d23612303 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-26 12:32:24 +02:00
monty@mysql.com
458a947f6c Fixed bug in table level privilege GRANT handling. (Bug #2178)
Portability fixes
2003-12-26 12:32:02 +02:00
bar@bar.intranet.mysql.r18.ru
1547a03c79 Bug 1552:
TIS620 to Unicode and Unicode to TIS620 conversion check.
2003-12-25 20:11:01 +04:00
bar@bar.intranet.mysql.r18.ru
6f0c8a7bf4 Bug 2202: CAST from binary to char still returns a binary string 2003-12-25 17:42:17 +04:00
bar@bar.intranet.mysql.r18.ru
b15ea37fc7 "like" did not work in some cases with character set big5 2003-12-24 16:59:48 +04:00
ram@gw.mysql.r18.ru
73a36f1997 Fix & test for the bug #2182: lpad returns incorrect result. 2003-12-22 19:00:51 +04:00
monty@mysql.com
0279dc4234 Portability fixes found during 5.0 test compilation
Fixed bug in ORDER BY on a small column (Bug #2147)
Fixed error from pthread_mutex_destroy() when one had wrong errmsg file
2003-12-21 19:39:32 +02:00
bar@bar.intranet.mysql.r18.ru
c49773237d Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.intranet.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-12-19 19:15:55 +04:00
monty@mysql.com
7dfcc949d6 after merge fixes 2003-12-19 17:15:54 +02:00
bar@bar.intranet.mysql.r18.ru
5be2b8b11a Fix for Bug#2151:
"USE db"  affected the character set of further CREATE DATABASEs,
which should have not happened.
2003-12-19 19:12:11 +04:00
monty@mysql.com
d4c32db181 merge with 4.0.18 2003-12-19 16:42:17 +02:00
monty@mysql.com
eeff10e4c1 merge 2003-12-19 16:34:48 +02:00
monty@mysql.com
031390a9a4 Fixes after merge with 4.0
Cleaned up embedded library access and query cache handling
Changed min stack size to 128K (to allow longer MyISAM keys)
Fixed wrong priority for XOR (should be less than NEG to get -1^1 to work)
2003-12-19 16:25:50 +02:00
lenz@kallisto.local
0605ab2edb - removed empty file mysql-test/t/rpl_temporary-master.opt 2003-12-19 12:47:10 +01:00
vva@eagle.mysql.r18.ru
f8552632fd Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2086/mysql-4.0
2003-12-18 18:08:39 -04:00
vva@eagle.mysql.r18.ru
f70b3897c4 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2086/mysql-4.0
2003-12-18 18:07:39 -04:00
monty@mysql.com
b9d8f108c1 Simple cleanups 2003-12-18 14:40:19 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
2b53eef5f0 WorkLog #1323 (part 2)
New Statement: SHOW [STORAGE] ENGINES
New System Variable: storage_engine
New mysqld Argument: --default-storage-engine=
2003-12-17 22:52:03 +00:00
vva@eagle.mysql.r18.ru
d49ff0fd62 added error message for receiving variable with wrong GLOBAL|LOCAL type
(bug #2086)
2003-12-17 16:37:47 -04:00
monty@mysql.com
e0cc6799ec Merge with 4.0.17 2003-12-17 17:35:34 +02:00
vva@eagle.mysql.r18.ru
59004f01f9 fixed restoring of thd->count_cuted_fields in store_val_in_field
(fixed #bug 2012)
2003-12-16 17:55:34 -04:00
ram@gw.mysql.r18.ru
795c88517e proper fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly.
note: bar asked me to use res.charset in ::sql_type() functions to be more consistent.
2003-12-16 17:39:33 +04:00
Sinisa@sinisa.nasamreza.org
05dddb73e1 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-12-16 14:45:37 +02:00
Sinisa@sinisa.nasamreza.org
a41f9de0d2 A new better test case for bug #2128 involving overflow
in decimal type with prepended zero's.
2003-12-16 14:43:34 +02:00
monty@mysql.com
87f7fe5714 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
2003-12-16 12:20:48 +01:00
monty@mysql.com
56f0abf7bb Portability fixes (mostly test suite)
Make ENGINE= an alias for TYPE= (Compabiltiy with 4.1)
Fix when using symlinked data files and realpath() is not working
2003-12-16 13:20:17 +02:00
guilhem@mysql.com
e56c8c61d8 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-12-16 11:12:40 +01:00
guilhem@mysql.com
db2d812d1b Fix for BUG#2083
"EE_ error codes (EE_DELETE, EE_WRITE) end up in the binlog, making slave stop".
The problem was that during execution of the command on the master, an error
can occur (for example, not space left on device, then mysqld waits and when
there is space it completes successfully: so finally it worked but the error
EE_WRITE remains in thd->net.last_errno and thd->net.last_error).
To know if finally the command succeeded, we test the 'error' variable in
every place, and if it shows no failure we reset thd->net.last_err* using
the function THD::clear_error() which is backported from 4.1.
A new test to see if now only real errors get to the binlog (note: the test
uses "rm").

Also a bit of memory free/alloc saving in log_event.cc (do not free the whole
mem_root after every query in the slave SQL thread: we can keep the initial
block of it; which will be freed when the thread terminates).
2003-12-16 11:10:50 +01:00
jani@rhols221.adsl.netsonic.fi
96555b5f90 Added support for multi statement tests. Use mysqltest internal
command delimiter to change the default delimiter (;) to something
else, a string upto 16 characters is allowed. Separate the sub
queries with ';' and end the whole statement with your own delimiter.
2003-12-16 06:09:44 +02:00
monty@mysql.com
cde713023a Cleanup 2003-12-16 02:23:40 +02:00
monty@mysql.com
3f4b1023d7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-15 23:18:40 +01:00
ram@gw.mysql.r18.ru
05c0c4ff26 part one of the fix for the bug #2077: accented characters in enum/defaul values are reported incorrectly 2003-12-15 21:01:38 +04:00
Sinisa@sinisa.nasamreza.org
5310897786 Merge 2003-12-15 18:14:07 +02:00
monty@mysql.com
76eb219781 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-15 18:02:29 +02:00
monty@mysql.com
2742701574 Added missing timeout function for named pipes and shared memory (fixes core dump on windows)
Signed auto_increment keys for HASH tables (like for MyISAM tables in 4.0)
nitialize system_charset_info() early. Fixes core dump when starting windows service
2003-12-15 17:58:15 +02:00
monty@mysql.com
217226f9af Portablity fix 2003-12-14 21:31:02 +01:00
monty@mysql.com
d47deebb58 Extend max_allowed_packet to 2G in mysql and mysqldump (Bug #2105)
Don't dump data for MRG_ISAM or MRG_MYISAM tables. (Bug #1846)
Ensure that 'lower_case_table_names' is always set on case insensitive file systems. (Bug #1812)
One can now configure MySQL as windows service as a normal user. (Bug #1802)
Database names is now compared with lower case in ON clause when lower_case_table_names is set. (Bug #1736)
IGNORE ... LINES option didn't work when used with fixed length rows. (Bug #1704)
Change INSERT DELAYED ... SELECT... to INSERT .... SELECT (Bug #1983)
Safety fix for service 'mysql start' (Bug #1815)
2003-12-14 06:39:52 +02:00
serg@serg.mylan
68416cc42a Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-13 18:49:45 +01:00
serg@serg.mylan
f8ed7ebbe1 insert table select * from table2 now converts charsets correctly 2003-12-13 18:49:10 +01:00
Sinisa@sinisa.nasamreza.org
35b8a0cde9 Already approved bug fix for #1561.
Bug happens in INTERVAL function when number of compared arguments
is 8 or more.
2003-12-13 17:20:35 +02:00
Sinisa@sinisa.nasamreza.org
923422c247 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-12-13 15:41:20 +02:00
monty@mysql.com
bd92d9b9ae Merge 2003-12-13 04:04:38 +02:00
vva@eagle.mysql.r18.ru
500192aef3 Merge vvagin@bk-internal.mysql.com:/home/bk/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_2023/mysql-4.0
2003-12-12 22:04:37 -04:00
vva@eagle.mysql.r18.ru
00d339c4de added checking for old cuted value in Field_enum::store
(bug #2023)
2003-12-12 21:26:44 -04:00
Sinisa@sinisa.nasamreza.org
15ab5d2ada Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-12-13 01:32:00 +02:00
monty@mysql.com
f995a5f4aa Fix autoincrement for signed columns (Bug #1366)
Fixed problem with char > 128 in QUOTE() function. (Bug #1868)
Disable creation of symlinks if my_disable_symlink is set
Fixed searching of TEXT with end space. (Bug #1651)
Fixed caching bug in multi-table-update where same table was used twice. (Bug #1711)
Fixed problem with UNIX_TIMESTAMP() for timestamps close to 0. (Bug #1998)
Fixed timestamp.test
2003-12-12 22:26:58 +02:00
hf@deer.(none)
e6e0937dc4 Proposed fix for #2093
it happens because of the LEFT JOINT optimization in add_key_part()
This optimization does exactly the same in JOIN and in WHERE conditions 
Not right.
I moved that optimization one level upper.
2003-12-12 21:26:20 +04:00
igor@rurik.mysql.com
324e979923 Merge rurik.mysql.com:/home/igor/mysql-4.0
into rurik.mysql.com:/home/igor/dev/mysql-4.0-1
2003-12-11 15:22:41 -08:00
igor@rurik.mysql.com
54628879fc Many files:
Fixed a bug causing a crash for multi-update/multi-delete
  with impossible where (bug #1860).
2003-12-11 14:55:48 -08:00
Sinisa@sinisa.nasamreza.org
a888caa7bc Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-12-11 16:01:37 +02:00
ram@gw.mysql.r18.ru
0395a3dd46 Added --comments mysqldump option (default value is 1).
Fixed mysqldump test.
2003-12-11 17:37:45 +04:00
ram@gw.mysql.r18.ru
9698e236ab Disable some tests until replace can handle regexp 2003-12-11 13:50:47 +04:00
monty@mysql.com
64d7e0162c Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/my/mysql-4.0
2003-12-11 06:24:32 +02:00
monty@mysql.com
7e92336b1d Fixed a possible memory leak on MacOSX when using the shared libmysql.so library (Bug #2061)
mysql_server_init() now returns error code if something went wrong (Bug #2062)
Don't use my_fopen() when reading symlink information as this may cause problems when a lot of files are opened.
Free thread keys with pthread_key_delete() instead of relying on automatic free. (Bug #2062)
Fixed bug in UNION statement with alias '*'. (Bug #1249)
Fixed a bug in DELETE ... ORDER BY ... LIMIT where the rows where not deleted in the proper order. (Bug #1024).
FOUND_ROWS() could return incorrect number of rows after a query with an impossible WHERE condition.
HOW DATABASES doesn't anymore show .sym files (on windows) that doesn't point to a valid directory. (Bug #1385)
2003-12-11 06:24:08 +02:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
7f83c17637 Fix for Bug #2075 - negative default values not accepted for integer columns
Allow numeric literals have a sign
2003-12-11 00:28:25 +00:00
bell@sanja.is.com.ua
e756a511f8 fixed unlocking tables during subquery execution (BUG#2048) 2003-12-10 22:46:14 +02:00
konstantin@mysql.com
87d50ac8b4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/kostja/mysql/mysql-4.0-1993
2003-12-10 17:41:15 +03:00
ram@gw.mysql.r18.ru
361fe81035 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2005
2003-12-10 18:41:12 +04:00
konstantin@mysql.com
38c454b0e4 fix for bug #1993 'bit functions do not return unsigned values'
introduced base class Item_func_bit for bit functions
2003-12-10 17:30:37 +03:00
konstantin@mysql.com
91c6f9a635 Merge mysql.com:/home/kostja/mysql/mysql-4.0-root
into mysql.com:/home/kostja/mysql/mysql-4.0-1790
2003-12-10 15:37:50 +03:00
konstantin@mysql.com
d04b02b977 followup to fix for bug #1790 BIT_AND() result in GROUP BY different when
SQL_BIG_RESULT used": now BIT_AND() always returns 18446744073709551615
if no rows were found.
This patch also fixes bug #1972: "BIT_AND() and BIT_OR() still return 
a *signed* 64bit value"
2003-12-10 15:17:23 +03:00
ram@gw.mysql.r18.ru
7576f1a81f changed usc2 -> koi8r to don't depend on extra-charset option. 2003-12-10 15:27:33 +04:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
fcf96dbb18 WorkLog#1323
Deprecate the use of TYPE=... Preferred syntax is ENGINE=
2003-12-10 04:31:42 +00:00
konstantin@mysql.com
8ee31c26f2 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/kostja/mysql/mysql-4.0-1335
2003-12-10 01:15:31 +03:00
konstantin@mysql.com
25a0bfb268 bug #1335 tests followup:
--disable_query_log was not a good idea, Serg says
2003-12-10 01:08:10 +03:00
igor@rurik.mysql.com
28113396ec key_cache.result, key_cache.test, mf_keycache.c:
Fixed a wrong return code by the function init_key_cache.
2003-12-09 13:29:38 -08:00
konstantin@mysql.com
5fa5a8df4e Fix for bug #1335: filesort is missing in EXPLAIN if ORDER BY NULL is used 2003-12-09 23:52:58 +03:00
bell@sanja.is.com.ua
e632fa7d4c Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
2003-12-09 22:34:23 +02:00
ram@gw.mysql.r18.ru
f913b942a9 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b1994
2003-12-09 22:00:33 +04:00
vva@eagle.mysql.r18.ru
17330df85f Merge 2003-12-09 13:34:57 -04:00
ram@gw.mysql.r18.ru
ab1c17b943 Fix for the bugs:
#2005 Long decimal comparion bug.                                               
#2055 mysqldump should replace "-inf" numeric field values with "NULL"
2003-12-09 17:33:29 +04:00
ram@gw.mysql.r18.ru
4d1f521f21 Fix for the bug #1994: mysqldump does not correctly dump UCS2 data. 2003-12-09 15:28:58 +04:00
ram@gw.mysql.r18.ru
9428000f46 test for the bug #1885: mysqldump does not dumps timestamp default. 2003-12-09 12:59:00 +04:00
gluh@gluh.mysql.r18.ru
38a4780fd1 Fixed test for 'init_slave' variable 2003-12-08 12:10:30 +04:00
gluh@gluh.mysql.r18.ru
a09d6409ae post-merge fixes 2003-12-08 09:44:04 +04:00
gluh@gluh.mysql.r18.ru
88f0fc283b Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.defweek
2003-12-07 15:11:08 +04:00
gluh@gluh.mysql.r18.ru
4831778587 WL#1175: more default_week_formats for iso compatibility
New formats added for 'week()' function and 'default_week_format' option(4 - 7).
Next formats is supported now:
*Value* *Meaning*
  `0'     Week starts on Sunday; First Sunday of the year starts week 1.
  	  Week() returns 0-53.
  `1'     Week starts on Monday; Weeks numbered according to ISO 8601:1988.
	  Week() returns 0-53.
  `2'     Week starts on Sunday; First Sunday of the year starts week 1.
  	  Week() returns 1-53.
  `3'     Week starts on Monday; Weeks numbered according to ISO 8601:1988.
	  Week() returns 1-53.
  `4'     Week starts on Sunday; Weeks numbered according to ISO 8601:1988.
	  Week() returns 0-53.
  `5'     Week starts on Monday;  First Monday of the year starts week 1.
  	  Week() returns 0-53.
  `6'     Week starts on Sunday; Weeks numbered according to ISO 8601:1988.
	  Week() returns 1-53.
  `7'     Week starts on Monday;  First Monday of the year starts week 1.
  	  Week() returns 1-53.
2003-12-07 15:10:21 +04:00
gluh@gluh.mysql.r18.ru
0cc01e25b4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.pass
2003-12-07 13:36:29 +04:00
serg@serg.mylan
6d0703ab5b QUERY_NO_GOOD_INDEX_USED and QUERY_NO_INDEX_USED moved from thd->lex.select_lex->options to thd->server_status 2003-12-06 23:21:09 +01:00
bell@sanja.is.com.ua
0ff8c294c0 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-drop-4.1
2003-12-04 23:58:03 +02:00
bell@sanja.is.com.ua
ccb07a4fbb fixed length of current database name if it is dropped (BUG#1986) 2003-12-04 23:57:10 +02:00
guilhem@mysql.com
c87747c39c Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-12-04 22:44:13 +01:00
guilhem@mysql.com
dd2303ce07 - Fix for BUG#1858 "SQL-Thread stops working when using optimize table":
we change THD::system_thread from a 'bool' to a bitmap to be able to
distinguish between delayed-insert threads and slave threads.
- Fix for BUG#1701 "Update from multiple tables" (one line in sql_parse.cc,
plus a new test rpl_multi_update.test). That's just adding an initialization.
2003-12-04 22:42:18 +01:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
1f02484341 Fixup error number - Broke during merge 2003-12-04 18:09:36 +00:00
monty@mysql.com
e36fd28447 Allow space in service names
move bdb/innodb tests to right places
2003-12-04 19:48:10 +02:00
gluh@gluh.mysql.r18.ru
132537accb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.0
into gluh.mysql.r18.ru:/home/gluh/mysql-4.0.bugfssl
2003-12-04 14:16:32 +04:00
gluh@gluh.mysql.r18.ru
d626c313e5 Fix for bug#1944 'Function RPad() sometimes produce unexpected result' 2003-12-04 14:12:01 +04:00
sergefp@mysql.com
70ff7b8254 Fix for bug #1980 tests 2003-12-03 19:49:31 +03:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
55d4248dae Merge for update 2003-12-02 20:57:34 +00:00
antony@ltantony.rdg.cyberkinetica.homeunix.net
afc619f0a2 WorkLog#1280 - Remove fixed table handler from lex/yacc 2003-12-02 20:23:13 +00:00
sergefp@mysql.com
801126c60b Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/psergey/mysql-4.0
2003-12-02 21:16:57 +03:00
sergefp@mysql.com
486415233e Fix for bug #1980 2003-12-02 21:05:40 +03:00
dlenev@mysql.com
0add961061 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-tsbg
2003-12-02 20:30:10 +03:00
dlenev@mysql.com
dd37ef055b Fix for Bug #1448 "Date parsing fails, and fails to complain
about it". Now numbers representing illegal timestamps are 
converted to 0 value if they are stored as timestamp or 
datetime. This behaviour is consistent with manual and with 
behaviour of string -> timestamp conversion.
2003-12-02 20:25:45 +03:00
hf@deer.(none)
02f382ecaa Fix for #1189 (Mess with names about CONSTRAINT)
Second edition: error message was deleted as Segey suggested
Now name of the constraint will be used as the name of the key
if the last not specified
2003-12-02 19:06:24 +04:00
monty@mysql.com
05e4d9031b Ensure that innodb is created for the first replication test as the slave-timeout is lower for future tests and this failed on some slower machines 2003-12-02 13:32:05 +02:00
igor@rurik.mysql.com
dcbbbe6b94 join_outer.result, null.result, null.test, item_cmpfunc.h:
Fixed inconsistency of values of used_tables_cache and
  const_item_cache for Item_func_isnull objects (bug #1990).
2003-12-01 13:59:09 -08:00
Sinisa@sinisa.nasamreza.org
168e81d6b6 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-12-01 13:47:05 +02:00
monty@mysql.com
f266cdabab Portability fixes (for binary build)
Added --protocol to mysqlbinlog
2003-12-01 13:13:16 +02:00
monty@mysql.com
3ee758497f Mark position as # to make test portable 2003-11-28 21:05:53 +02:00
serg@serg.mylan
77d137a24a Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-11-28 18:18:58 +01:00
monty@mysql.com
5914033478 merge with 4.0 to get fix for range bug 2003-11-28 15:55:43 +02:00
monty@mysql.com
4f42a47408 Fixed range optimzier bug (Bug #1828) 2003-11-28 15:45:34 +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
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
bff0bbeb1f merged 2003-11-25 18:26:53 +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
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
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
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
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
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@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
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
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
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
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