mronstrom@mysql.com
5bd4d59508
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/mikron/mysql-4.1
2004-09-02 19:29:11 +02:00
pem@mysql.comhem.se
e04f4fb46c
Fixed BUG#5307: Stored procedure allows statement after BEGIN ... END.
2004-09-02 19:14:34 +02:00
heikki@hundin.mysql.fi
290443298a
srv0start.c:
...
Change a reference to ibman.php to a reference in the MySQL manual; someone should change the 20 other places in the source code where we still refer to ibman.php
2004-09-02 20:06:25 +03:00
konstantin@mysql.com
2f191db2b1
A fix and test case for Bug#4231 "Wrong result with MYSQL_TIME
...
parameters": when unpacking binary time recieved from client, handle
the case when length is 0: it means all MYSQL_TIME members are zero.
2004-09-02 20:16:01 +04:00
pem@mysql.comhem.se
fee115adca
Fixed BUG#5287: Stored procedure crash if leave outside loop.
...
Bug in diff_handlers and diff_cursors made it attempt to pop
the wrong number at jumps sometimes.
2004-09-02 17:24:25 +02:00
monty@mysql.com
8547d98c88
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-09-02 16:58:01 +03:00
monty@mysql.com
dec44916c1
After merge fixes
2004-09-02 16:57:26 +03:00
mronstrom@mysql.com
99f9ff912f
Fix for overwriting of the stack when table name length was larger
...
than 32 bytes. getWords interpreted length as number of words and
got number of bytes.
2004-09-02 15:13:50 +02:00
mronstrom@mysql.com
22f21ba700
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/mikron/mysql-4.1
2004-09-02 15:04:35 +02:00
ram@gw.mysql.r18.ru
c6b2b2f09d
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b5232
2004-09-02 16:25:32 +05:00
hf@deer.(none)
ea5fd2b4bb
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.4815
2004-09-02 15:22:59 +05:00
bell@sanja.is.com.ua
f1bbfdf4a6
checked INTO clause during view creation (BUG#5332)
2004-09-02 12:09:26 +03:00
marko@hundin.mysql.fi
06f97a0b03
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-09-02 10:34:28 +03:00
bar@mysql.com
f37df2fdcc
Bug#4338 mysql-test-run fails if compiled with non-latin1 character set
2004-09-02 12:34:27 +05:00
marko@hundin.mysql.fi
f77a89c386
Merge marko@build.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2004-09-02 10:17:58 +03:00
hf@deer.(none)
21acb551ab
Merge bk@192.168.21.1:/usr/home/bk/mysql-4.1
...
into deer.(none):/home/hf/work/mysql-4.1.4815
2004-09-02 11:11:16 +05:00
hf@deer.(none)
5a817ea665
Addition to the fix for #4815
2004-09-02 11:10:26 +05:00
bell@sanja.is.com.ua
31dacc6ede
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
2004-09-02 07:52:29 +03:00
bell@sanja.is.com.ua
1410ac22c4
fixed bug handling in views (BUG#5276)
2004-09-02 07:40:48 +03:00
miguel@hegel.txg.br
fc11887596
Fix for bug #5302
2004-09-02 01:17:28 -03:00
bell@sanja.is.com.ua
36667b6a91
fixed printing of characters casting operartion (BUG#5264)
2004-09-02 00:11:40 +03:00
bell@sanja.is.com.ua
d1b667bdd1
fixed staistic of subquery if outer field resolved in merged view (BUG#5247)
2004-09-01 23:27:40 +03:00
bell@sanja.is.com.ua
d38bd725ef
system charset (with wich VIEW printed) saved in .frm and restored before parsing view (BUG#5163)
2004-09-01 22:48:59 +03:00
bell@sanja.is.com.ua
b57e68e6e0
fixed typo in group_concat printing (BUG#5161)
2004-09-01 21:32:24 +03:00
bell@sanja.is.com.ua
80a28d458a
fixed printing of real constants (BUG#5160)
2004-09-01 20:30:48 +03:00
miguel@hegel.txg.br
ca42de54a1
Fix for bug #5302
2004-09-01 14:02:11 -03:00
bell@sanja.is.com.ua
56d8567a3d
adding mysql.proc to table list if view contains stored procedures (BUG#5151)
2004-09-01 19:00:41 +03:00
lenz@mysql.com
7b8b5d8969
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0
2004-09-01 16:17:49 +02:00
lenz@mysql.com
1483564b49
Merge mysql.com:/space/my/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0-build
2004-09-01 16:04:51 +02:00
lenz@mysql.com
80879cffe6
- removed swedish errmsg.OLD
2004-09-01 16:04:01 +02:00
heikki@hundin.mysql.fi
40c0fde904
ha_innodb.cc:
...
If ALTER TABLE ... DROP FOREIGN KEY ... fails because of a wrong constraint name, return a table handler error number 150 instead of 152; the value 152 was misleading, as it referred to '152 = Cannot delete a parent row', whereas '150 = Foreign key constraint is incorrectly formed' is less misleading
2004-09-01 16:41:09 +03:00
marko@hundin.mysql.fi
09f3166267
row0mysql.c:
...
row_drop_table_for_mysql(): Removed duplicated block of code.
2004-09-01 14:04:17 +03:00
joerg@mysql.com
1a44a2110c
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into mysql.com:/M40/mysql-4.0
2004-09-01 12:46:56 +02:00
bar@mysql.com
153e18a252
Allow IN to convert arguments into Unicode in some cases.
2004-09-01 15:39:15 +05:00
joerg@mysql.com
9e2e71816f
Correct a typo error: cpp symbol is "BIG_TABLES", not "BIG_FILES"
...
(backport from 4.1).
2004-09-01 12:36:01 +02:00
bar@mysql.com
4f32cd2b3d
Move collation aggregation with superset conversion code
...
from Item_bool_func2 into DTCollation to make it reusable
for other types of items.
2004-09-01 13:56:33 +05:00
konstantin@mysql.com
3ee572768b
Make client_test pass on 64-bit HP-UX11: long is 64 bit,
...
replace all (mis)uses of it with int32.
2004-09-01 12:50:23 +04:00
patg@krsna.patg.net
54eac3b8d4
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into krsna.patg.net:/home/patg/mysql-4.0
2004-08-31 19:04:07 -07:00
patg@krsna.patg.net
e277145911
mysqld_safe.sh:
...
bug #5001 , added conditional if to test if port set, then only kill the processes
for this port, not all processes (in the case of this bug where multiple servers
are killed.)
The change to the 'grep' to make sure mysqld_safe isn't killed was per Serg's
discovery that mysqld_safe would get killed.
In my testing, in killing one of the pids for a running server, the "if test ! -f $pid_file"
was the case that evaluated as true, so in order to test, I had to comment that block
out.
2004-08-31 18:59:41 -07:00
monty@mysql.com
054cea4ca8
Merge with 4.0
2004-09-01 04:12:09 +03:00
monty@mysql.com
ba4d4ce97a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-09-01 02:13:35 +03:00
mwagner@here.mwagner.org
3f0f1a4fb2
Do-compile:
...
Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.
2004-08-31 13:29:28 -05:00
bell@sanja.is.com.ua
b02451c5bd
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-not-4.1
2004-08-31 21:11:54 +03:00
bell@sanja.is.com.ua
2cf1234ba2
after review patch
2004-08-31 21:10:57 +03:00
ram@gw.mysql.r18.ru
b93a973b12
Added global my_getopt_error_reporter function pointer which is
...
used in the handle_options() function (instead of using additional
handle_option() parameter). The default value of the
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.
2004-08-31 21:27:58 +05:00
mskold@mysql.com
ae801bad8d
Merge mskold@build.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1
2004-08-31 15:53:28 +02:00
bar@mysql.com
34688d710c
Better easier to call error message format.
2004-08-31 18:53:27 +05:00
lenz@mysql.com
87cbc358e9
- bumped up version number in configure.in to "4.1.5-gamma"
...
- tagged ChangeSet@1.2013 as "mysql-4.1.4"
2004-08-31 15:53:26 +02:00
monty@mysql.com
7abae83300
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/my/mysql-4.1
2004-08-31 16:53:25 +03:00
vva@eagle.mysql.r18.ru
e022b3144e
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
...
into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1
2004-08-31 18:53:24 +05:00