Commit graph

10609 commits

Author SHA1 Message Date
bell@sanja.is.com.ua
e5fa5585f0 removed droping field->query_id for reinitialization tables for subquery.
(BUG#2089)
2004-01-03 00:12:07 +02:00
heikki@hundin.mysql.fi
1c74cd9bf5 row0purge.c:
Fix bug: if purge of a table was not possible because its .ibd file was missing, trx->dict_operation_lock_mode was left to a wrong value, causing an assertion failure
2004-01-01 01:51:36 +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
jani@rhols221.adsl.netsonic.fi
934f08c5d1 Fixed Bug#1472, mysql \h output out of order. 2003-12-30 17:58:39 +02:00
bar@bar.intranet.mysql.r18.ru
210a87507c latin1.xml, Index.xml:
Modern Spanish collation
2003-12-29 19:58:18 +04:00
bar@deer.(none)
b13808d55f logging_ok:
Logging to logging@openlogging.org accepted
item_strfunc.cc:
  Bug wich appeared in ctype_tis620 is fixed
2003-12-29 18:45:13 +04: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
105fae05c1 dump_map.c:
new file
2003-12-25 19:07:44 +04:00
bar@bar.intranet.mysql.r18.ru
08d8c0b9e4 languages.html:
new file
2003-12-25 17:46:30 +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
37467ebe07 sql_parse.cc:
Fix for the bug 1175: Usernames will not converted to utf8 during connect
2003-12-24 17:58:06 +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
bar@bar.intranet.mysql.r18.ru
10f0bf3507 charset.c:
he mysqld server crashes if issued a command select convert(...)
  with a
  non-compiled character set:
2003-12-24 16:04:26 +04:00
bar@bar.intranet.mysql.r18.ru
807b88505d install_test_db.sh:
install-test-db did not substiture the path to charsets file, so tests failed with non-default collation incompiled, for example --with-collation=latin1_german1_ci
mysqld.cc:
  better error messaging
2003-12-24 16:04:25 +04:00
hf@deer.(none)
9db115c027 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2046
2003-12-24 16:04:24 +04:00
paul@teton.kitebird.com
d1517d4997 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-23 09:47:02 -06:00
hf@deer.(none)
2c8a402e5c Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2181
2003-12-23 18:25:45 +04:00
hf@deer.(none)
a735a51402 Fix for #2181 (mysql_execute crashed instead of returning error on embedded
server)
We didn't perform the check for the error for embedded server
2003-12-23 18:24:33 +04:00
konstantin@mysql.com
445b5ebe32 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-prep
2003-12-23 16:17:46 +03:00
hf@deer.(none)
2d4fbe5a5a Fix for #2184 (Prepared statements if embedded library broken)
There was an error with same function/class member names
2003-12-23 17:17:45 +04:00
konstantin@oak.local
3382eea70e short patch for bug #2184 'Prepared statements in embedded library was
broken with recent changes' (attempt 2).
Adding Statement_core is better because:
- set_statement() code is shorter and you don't need to modify it when adding
new members to Statement_core
- a bit faster (you don't have virtual call and don't free_root() twice)
Do that short patch instead in hope that set_statement() will be sooner or
later removed entirely
2003-12-23 15:38:19 +03:00
paul@teton.kitebird.com
4050a2f58a Minor comment edits. 2003-12-22 13:08:16 -06:00
paul@teton.kitebird.com
921df22da8 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-22 09:41:21 -06:00
konstantin@mysql.com
60adb16163 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-22 15:57:59 +03:00
konstantin@oak.local
ce88d81796 Names of all client methods (static functions inside client.c) now
uniform: cli_ + member name.
2003-12-22 15:57:34 +03:00
serg@serg.mylan
e08f20c462 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-12-21 21:19:42 +01:00
serg@serg.mylan
0da22d5bd8 typo fixed 2003-12-21 21:18:59 +01:00
konstantin@mysql.com
e7a4e45cce Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-root
2003-12-21 22:37:28 +03:00
konstantin@oak.local
9de694e5eb THD::init_for_queries() pushed back:
see comments to the method why
2003-12-21 22:26:45 +03:00
monty@mysql.com
5eb92715d1 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-21 19:39:58 +02: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
heikki@hundin.mysql.fi
947057e771 univ.i, srv0srv.c:
Define macro ULINTPF which can be used in printf statements as the print format of ulint both on Win64 and other platforms
2003-12-20 13:48:35 +02:00
heikki@hundin.mysql.fi
734870d0ce srv0start.c, univ.i, configure.in:
Check at compilation time on Unix that InnoDB ulint is the same size as void*, and also check it at runtime
2003-12-20 13:13:55 +02:00
monty@mysql.com
528c33106d Merge fix 2003-12-20 03:42:17 +02:00
monty@mysql.com
0448a3f4c0 Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
A after merge fix for last merge
2003-12-20 03:41:04 +02:00
konstantin@oak.local
34c03bdf99 one line was removed during merge 2003-12-20 03:06:33 +03:00
konstantin@mysql.com
4a0ac0029d Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/kostja/mysql/mysql-4.1-prep_st_hack
2003-12-20 02:27:32 +03:00
konstantin@oak.local
2a25b2617a Prepared_statement deployed instead of PREP_STMT. 2003-12-20 02:16:10 +03:00
paul@teton.kitebird.com
84930f2d10 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-19 16:20:59 -06:00
monty@mysql.com
4b3e443b36 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/my/mysql-4.1
2003-12-19 19:51:06 +01:00
heikki@hundin.mysql.fi
df73dc7828 univ.i, ut0ut.h, ut0ut.c:
On 64-bit Windows use InnoDB's own printf function where %lu is converted to %I64u; this eliminates Intel compiler warnings on IA64
2003-12-19 20:39:19 +02:00
monty@mysql.com
fcbee7eb1a merge with lex pointer change patch 2003-12-19 20:18:18 +02:00
monty@mysql.com
1b7f67d65b Fixed memory overrun bug in DELETE ... ORDER BY 2003-12-19 19:16:26 +01:00
konstantin@oak.local
d37da004f6 THD::lex now points to THD::main_lex like in 5.0
All tests pass (client_test included)
2003-12-19 20:52:13 +03:00
paul@teton.kitebird.com
5b1422ee61 Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1
into teton.kitebird.com:/home/paul/mysql-4.1
2003-12-19 10:21:15 -06: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