petr@mysql.com
d2b9085df8
Fix for Bug #13124 Stored Procedure using SELECT INTO crashes server
2005-09-13 15:15:38 +04:00
kent@mysql.com
1313a30c83
innochecksum.c:
...
Changed from C++ comments to C comments
Did some adaption to MySQL Coding Style
2005-09-13 02:31:47 +02:00
kent@mysql.com
b5dbd1c7a1
mysql-test-run.pl:
...
Corrected typo
2005-09-13 01:41:15 +02:00
kent@mysql.com
0fa6cb9b19
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-13 01:22:11 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
e760a58f07
Merged from 4.1 to 5.0.
2005-09-13 01:44:50 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
cb55497bdb
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-13 01:11:55 +03:00
jmiller@mysql.com
9f573f0ac8
Adding comment for force manual merge 5.0 -> wl1012
2005-09-12 22:47:15 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
01ce8a8aa9
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-12 20:18:49 +03:00
timour@mysql.com
d0f585f11f
BUG#12943 - post-merge fix
2005-09-12 19:18:17 +03:00
timour@mysql.com
54db60c080
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-bug-12943
2005-09-12 19:05:55 +03:00
gluh@mysql.com
c398940326
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 20:49:48 +05:00
monty@mishka.mysql.com
bdc33e2356
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mishka.mysql.com:/home/my/mysql-4.1
2005-09-12 18:49:47 +03:00
monty@mishka.mysql.com
0965bfa832
Review fixes since last pull
...
Fix for bug #13025 ; Server crash in filesort because wrong call to handler::position()
2005-09-12 18:48:17 +03:00
bar@mysql.com
2315c4f224
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-09-12 19:38:53 +05:00
bar@mysql.com
833bccfe57
Many files:
...
Adding esperanto collation
2005-09-12 19:35:50 +05:00
gluh@mysql.com
96e2471a32
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 17:43:02 +05:00
gluh@mysql.com
d91fb61b37
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/gluh/MySQL/Bugs/4.1.6008
2005-09-12 17:33:21 +05:00
jonas@eel.(none)
40cc9e5c42
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-12 14:30:52 +02:00
tulin@dl145c.mysql.com
e382a0fb12
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0
2005-09-12 14:11:28 +02:00
gluh@eagle.intranet.mysql.r18.ru
d9bd3c11e4
Fix for bug #6008 : MySQL does not create warnings when creating database and using IF NOT EXISTS
...
produce warning for 'create database if not exists' if database exists
do not update database options in this case
produce warning for 'create table if not exists' if table exists
2005-09-12 17:09:19 +05:00
tulin@dl145c.mysql.com
f80e113d0e
removed a few aborts from mgmapi
...
corrected typo in ndb Parser
2005-09-12 14:03:23 +02:00
lars@mysql.com
fd85a82559
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
2005-09-12 13:00:55 +02:00
ramil@mysql.com
fa2cb2ae82
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b12917
2005-09-12 15:38:21 +05:00
ramil@mysql.com
4b57db2447
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b12917
2005-09-12 15:28:09 +05:00
bar@mysql.com
0d97562bd3
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b12891
2005-09-12 15:26:01 +05:00
gluh@mysql.com
2db09b4cfc
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0
2005-09-12 15:04:22 +05:00
gluh@mysql.com
bada46cbf0
manual merge
2005-09-12 15:02:57 +05:00
ramil@mysql.com
b0ae5792c8
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b12917
2005-09-12 14:55:17 +05:00
jonas@eel.(none)
f9134bd920
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-12 11:43:22 +02:00
gluh@eagle.intranet.mysql.r18.ru
2a07350854
ps_6bdb, ps_7ndb tests failure fix
2005-09-12 14:21:38 +05:00
bar@mysql.com
2f13c5c12c
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/bar/mysql-5.0.b12891
2005-09-12 14:09:44 +05:00
lars@mysql.com
683edc6599
Reverted old fix with sync_slave_with_master and added a replace commands
...
to eliminate nondeterminism in slave start
2005-09-12 10:50:42 +02:00
ramil@mysql.com
33d91d2e73
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b12917
2005-09-12 13:44:20 +05:00
jonas@eel.(none)
39e2548da5
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-09-12 10:42:09 +02:00
jonas@eel.(none)
d00732d97d
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-12 10:40:40 +02:00
mskold@mysql.com
357132b0b8
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-09-12 10:26:09 +02:00
kent@mysql.com
e6567efd99
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-09-12 10:18:39 +02:00
ramil@mysql.com
b424f5450b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/home/ram/work/5.0.b12917
2005-09-12 13:08:08 +05:00
jan@hundin.mysql.fi
cbc0f19566
Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into hundin.mysql.fi:/home/jan/mysql-5.0
2005-09-12 10:57:42 +03:00
mskold@mysql.com
216f3d3dff
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-09-12 09:37:17 +02:00
mskold@mysql.com
a934f75e81
Repair of condition pushdown after Item_func_between/in objects now directly represent NOT BETWEEN/IN expressions (ChangeSet@1.2402.1.1)
2005-09-12 09:36:07 +02:00
ramil@mysql.com
c4ea0e2bf8
merging
2005-09-12 12:09:44 +05:00
timour@mysql.com
7205d3716c
Merge mysql.com:/home/timka/mysql/src/5.0-virgin
...
into mysql.com:/home/timka/mysql/src/5.0-dbg
2005-09-12 09:34:58 +03:00
timour@mysql.com
6a528590d9
Fix for BUG#13067 "JOIN ... USING is case sensitive".
2005-09-12 08:28:53 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
afb613bd8e
Merged from 4.1
2005-09-11 22:10:04 +03:00
lars@mysql.com
e5503c277f
Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1
...
into mysql.com:/users/lthalmann/bk/mysql-4.1-magnus
2005-09-11 13:46:36 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
91b6fe2679
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
2005-09-11 11:07:56 +03:00
jani@a193-229-222-105.elisa-laajakaista.fi
27373d1d11
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-09-11 10:31:55 +03:00
jonas@eel.(none)
1fabde4309
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-09-11 08:43:02 +02:00
jonas@eel.(none)
8840301681
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-09-11 08:41:33 +02:00