hartmut@mysql.com
d2ec3d0c75
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
2005-12-06 14:19:17 +01:00
bar@mysql.com
fc19590b41
cp1250.xml:
...
Index.xml:
Adding Polish collation for cp1250.
2005-12-06 16:19:50 +04:00
jimw@mysql.com
4f8b8e5027
Merge mysql.com:/home/jimw/my/mysql-5.1-14880
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-05 18:09:42 -08:00
jimw@mysql.com
074e15b7ab
Merge mysql.com:/home/jimw/my/mysql-5.1-14671
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-05 18:07:48 -08:00
patg@krsna.patg.net
bc5ee61f66
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.1-new2
2005-12-05 13:57:02 -08:00
joerg@mysql.com
2eb0e9a43c
Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1
2005-12-05 19:00:00 +01:00
joerg@mysql.com
b9451ee51f
Merge from 4.1, partly manual.
2005-12-05 18:33:48 +01:00
knielsen@mysql.com
2713a7e15e
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/usr/local/mysql/mysql-5.1-new
2005-12-05 18:01:44 +01:00
joerg@mysql.com
7ce92291f0
Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.
...
(Backport of an identical change from 5.0)
2005-12-05 17:53:42 +01:00
joerg@mysql.com
84db1b25a2
Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1
2005-12-05 17:10:43 +01:00
patg@krsna.patg.net
ad594d3557
WORKLOG #2983 Removed --help from test. (did so already, don't know why
...
push didn't push that previous changeset!)
2005-12-05 07:50:16 -08:00
joerg@mysql.com
b5293c415f
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/mysql-5.0
2005-12-05 16:42:28 +01:00
hartmut@mysql.com
4c20a4da25
fixed "perror --ndb" for 5.1 (bug #15486 )
2005-12-05 14:17:53 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
a13220472f
Disabled test.
2005-12-05 13:33:46 +02:00
knielsen@mysql.com
17cab43fcf
Bug#15097: Missing \n in header printed by mysql --help when HAVE_READLINE
...
is not defined.
2005-12-05 12:12:08 +01:00
hartmut@mysql.com
9bd4f3225a
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
2005-12-05 11:32:51 +01:00
hartmut@mysql.com
45adda8fd1
added --server-id option to mysqlbinlog to filter for a certain server id
...
in the binlog only
2005-12-05 11:21:30 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
715becac5b
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-12-05 10:24:54 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
c6d933c629
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-12-04 20:57:34 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
4f6a321bb8
Fixes multi_statement test case on NetWare.
2005-12-04 15:39:44 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
d88d8081da
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1
2005-12-04 15:34:47 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
669a12fdb0
A set of Netware related patches.
2005-12-04 15:02:06 +02:00
patg@krsna.patg.net
2c2c812846
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into krsna.patg.net:/home/patg/mysql-build/mysql-5.1-slap
2005-12-03 17:17:07 -08:00
kent@mysql.com
9fd13ba93d
my_global.h:
...
Make __cxa_pure_virtual weak symbol
2005-12-03 20:52:34 +01:00
kent@mysql.com
28fa86f45e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
2005-12-03 14:40:24 +01:00
bell@sanja.is.com.ua
3d2d9c2259
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
2005-12-03 08:56:00 +02:00
patg@krsna.patg.net
9503c7e514
WORKLOG #2983 Post review fixes
2005-12-02 22:07:11 -08:00
jimw@mysql.com
52bb91cceb
Merge mysql.com:/home/jimw/my/mysql-5.1-14655
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-02 16:11:04 -08:00
msvensson@devsrv-b.mysql.com
997f7027ae
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into devsrv-b.mysql.com:/space/magnus/my50-bug11731
2005-12-02 23:37:38 +01:00
evgen@moonbone.local
2ac237bc2e
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into moonbone.local:/work/15028-bug-5.1-new-mysql
2005-12-03 00:53:25 +03:00
evgen@moonbone.local
e3103ad5d9
disabled.def:
...
Failing tests func_group func_math group_min_max are disabled
2005-12-03 00:52:41 +03:00
bell@sanja.is.com.ua
58c581ab62
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-02 22:59:29 +02:00
vtkachenko@quadxeon.mysql.com
c990ffdc08
Merge bk-internal:/home/bk/mysql-5.1-new
...
into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new1
2005-12-02 21:19:13 +01:00
vtkachenko@quadxeon.mysql.com
06df985963
mysqld.cc:
...
Fix help message
2005-12-02 21:17:40 +01:00
msvensson@devsrv-b.mysql.com
75bd92f1c6
Merge msvensson@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into devsrv-b.mysql.com:/space/magnus/my50-bug11731
2005-12-02 21:06:35 +01:00
konstantin@mysql.com
6f63650d72
Add a test case for Bug#5967 "Stored procedure declared variable
...
used instead of column", the bug is to be fixed later.
2005-12-02 22:43:56 +03:00
bell@sanja.is.com.ua
b1f0e78146
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-bug1-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-02 21:20:25 +02:00
bell@sanja.is.com.ua
45e59f3d76
Now we shall store only position (index of first character)
...
of SELECT from query begining, to be independet of query buffer
allocation.
Correct procedure used to find beginning of the current statement
during parsing (BUG#14885).
2005-12-02 21:18:12 +02:00
evgen@moonbone.local
f2559fbcc3
Merge moonbone.local:/work/15028-bug-5.0-mysql
...
into moonbone.local:/work/15028-bug-5.1-new-mysql
2005-12-02 22:07:10 +03:00
evgen@moonbone.local
70abb812fb
sql_cache.cc:
...
After merge fix
2005-12-02 22:04:22 +03:00
bell@sanja.is.com.ua
54b7e6e3dc
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-02 20:50:54 +02:00
evgen@moonbone.local
b7d7f78fd0
query_cache.result:
...
After merge fix
2005-12-02 21:05:23 +03:00
pem@mysql.com
e7a7af07b2
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/mysql-5.1-new
2005-12-02 18:43:08 +01:00
msvensson@devsrv-b.mysql.com
17cc99470b
Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug11731/my50-bug11731
...
into devsrv-b.mysql.com:/space/magnus/my50-bug11731
2005-12-02 18:37:16 +01:00
msvensson@neptunus.(none)
c753df999c
Bug #11731 mysqltest in multi-statement queries ignores errors in non-1st queries
...
- Add tests to mysqltest.test
- Problem no longer exists
2005-12-02 18:29:15 +01:00
evgen@moonbone.local
00b902b065
Manually merged
2005-12-02 19:42:14 +03:00
evgen@moonbone.local
151350536c
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into moonbone.local:/work/15028-bug-4.1-mysql
2005-12-02 18:42:05 +03:00
pem@mysql.com
035c24beeb
Merge mysql.com:/usr/local/bk/mysql-5.0
...
into mysql.com:/usr/home/pem/bug14376/mysql-5.0
2005-12-02 15:04:50 +01:00
pem@mysql.com
ed6e09a38c
Post-review fixes for BUG#14376: MySQL crash on scoped variable (re)initialization
2005-12-02 14:30:42 +01:00
bell@sanja.is.com.ua
68a20f3ef7
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge1-5.0
2005-12-02 14:00:12 +02:00