sergefp@mysql.com
43221ad9e1
Fix for bug #1980
2003-12-02 21:20:51 +03:00
sergefp@mysql.com
82270288de
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/psergey/mysql-5.0
2003-11-28 00:34:52 +03:00
sergefp@mysql.com
ae15947360
Fix for bug 1974
2003-11-28 00:31:15 +03:00
pem@mysql.comhem.se
d8bf426b80
Fixed BUG#1965: Opening a cursor hangs client when malformed select fails
...
and BUG#1966: "select 1 into a" on top-level hangs client
2003-11-27 16:48:21 +01:00
konstantin@oak.local
d8603604e8
typo in comment
2003-11-27 00:16:34 +03:00
konstantin@oak.local
bca3689f93
typo fixed
2003-11-25 15:39:35 +03:00
konstantin@oak.local
ad74f5bfe5
misplaced comment moved to relevant line
2003-11-25 15:28:43 +03:00
pem@mysql.com
56ec2351a0
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2003-11-24 18:26:52 +01:00
pem@mysql.comhem.se
47f9c2946f
Changed "query" into "statement", and corrected SQL state code (04000->0A000).
2003-11-24 18:24:14 +01:00
konstantin@mysql.com
09f2d912dc
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kostja/mysql/mysql-5.0-root
2003-11-23 17:35:19 +03:00
konstantin@oak.local
9c3632fb83
Cleanups:
...
- unused variable THD::con_root removed
- we don't need to bzero(&warn_root) just before init_alloc_root(&warn_root)
- we don't need to bzero(&transaction.mem_root) because we
bzero(&transaction) later in THD::THD
- we don't need to free thd->mem_root thd->transaction.mem_root
in handle_one_connection because they are freed in THD::~THD
which is called in end_thread later
2003-11-23 17:34:36 +03:00
sergefp@mysql.com
c8bc4edc7f
Merge mysql.com:/home/psergey/mysql-5.0
...
into mysql.com:/home/psergey/10-get-mysql5
2003-11-22 00:26:43 +03:00
sergefp@mysql.com
4f721196f3
Post-merge fixes
2003-11-22 00:20:48 +03:00
bell@sanja.is.com.ua
6f73baf126
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2003-11-21 20:53:12 +02:00
bell@sanja.is.com.ua
e3e4836f30
warning number changed
2003-11-21 20:52:18 +02:00
pem@mysql.com
e85a82060a
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/home/pem/work/mysql-5.0
2003-11-21 18:27:21 +01:00
pem@mysql.comhem.se
d9b8a35eeb
Translated 5.0 error codes into sql states.
2003-11-21 18:23:05 +01:00
konstantin@mysql.com
0abebc7dd0
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/kostja/mysql/mysql-5.0-root
2003-11-21 17:23:24 +03:00
konstantin@oak.local
d7fe94c798
unused variable handler_items removed
2003-11-21 17:22:54 +03:00
pem@mysql.comhem.se
86039a34e5
Made Item_splocal printable.
2003-11-21 14:00:40 +01:00
sergefp@mysql.com
30b3c3bf1b
Merged, most likely needs post-merge fix
2003-11-21 00:27:54 +03:00
sergefp@mysql.com
4016048d81
logging_ok:
...
Logging to logging@openlogging.org accepted
sql_union.cc, sql_select.cc, opt_range.h, opt_range.cc, opt_ft.h:
Post-merge fixes
Many files:
new file
2003-11-20 23:27:11 +03:00
pem@mysql.comhem.se
5e46a05960
Fixed BUG#1874: Don't call fix_fields() indiscriminately, it resets null_value
...
for some items, which made aggregates like MIN(), MAX() and SUM() fail.
2003-11-20 18:30:02 +01:00
pem@mysql.comhem.se
05f25feaa9
Handle null values correctly in SP local variables.
2003-11-20 16:14:24 +01:00
pem@mysql.comhem.se
96f1252899
Bugfixes in SHOW CREATE PROCEDURE/FUNCTION and SHOW PROCEDURE/FUNCTION STATUS;
...
- dropped routines should not show up in status
- error handling for non-existing routines
+ some cleanup.
2003-11-20 15:07:22 +01:00
pem@mysql.comhem.se
5b355ea6f5
Post-merge fixes.
2003-11-19 16:59:35 +01:00
pem@mysql.com
28a2c6a96b
Merging 4.1->5.0.
2003-11-19 15:19:46 +01:00
bar@bar.mysql.r18.ru
8e1584d79e
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-11-19 15:00:01 +04:00
bar@bar.mysql.r18.ru
4accd55c71
cp850.xml:
...
There were errors in cp850: in unicode, ctype and sort arrays
2003-11-19 14:59:12 +04:00
pem@mysql.comhem.se
c4871b240d
Fixed BUG#1862 (flush table in SPs didn't work).
...
Fixed various bugs: setting local variables to NULL, SELECT INTO var now actually
might work, SELECT INTO with not row now gives a "no data" warning (instead of
the "empty query" error), etc.
Updated test cases accordingly.
2003-11-19 11:26:18 +01:00
pem@mysql.comhem.se
1d300f81d0
Fixed C syntax error in mysys/mf_keycache.c.
2003-11-19 09:45:49 +01:00
lenz@kallisto.local
75ba1891bd
- added a missing comma in sql_yacc.yy (maybe a merge error?)
2003-11-18 22:47:04 +01:00
lenz@mysql.com
9258cae133
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2003-11-18 21:41:23 +01:00
bell@sanja.is.com.ua
dcdc78864d
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2003-11-18 22:24:43 +02: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
greg@mysql.com
678d465727
Merge gweir@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/bk/mysql-4.1
2003-11-18 15:20:33 -05:00
greg@mysql.com
2a23f98521
Merge mysql.com:/bk/mysql-4.1 into mysql.com:/home/greg/bk/4.1
2003-11-18 15:18:02 -05:00
greg@mysql.com
119b689b3b
Add Docs/internals.texi to Windows source packages.
2003-11-18 15:17:41 -05: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
3c1f98661f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1
2003-11-18 22:04:33 +02:00
bell@sanja.is.com.ua
b404412877
changed name of bit on more descriptive (after rewie change)
2003-11-18 22:04:01 +02:00
lenz@mysql.com
25cd7c3bfe
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1
2003-11-18 20:51:25 +01:00
bell@sanja.is.com.ua
b02af20aff
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1
2003-11-18 21:08:56 +02: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
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
bell@sanja.is.com.ua
3ae908c44b
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-used_tables-4.1
2003-11-18 17:48:06 +02:00
lenz@kallisto.local
578a677468
- internals.texi will now be part of the source distribution. However,
...
as this is a document that belongs to the mysqldoc tree, it needs to
be copied over manually (using the Bootstrap script), before doing an
official release distribution. The file Docs/internals.texi in this tree
is only a dummy file to keep "make dist" happy.
2003-11-18 16:48:02 +01: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