Commit graph

28639 commits

Author SHA1 Message Date
jimw@mysql.com
0c23407a63 Add missing BDB include file 2005-12-05 16:48:09 -08:00
jimw@mysql.com
d6264806b6 Remove generated BDB README file 2005-12-05 16:19:16 -08:00
jimw@mysql.com
786efa8332 Cleanup after import of BDB 2005-12-05 16:03:52 -08:00
jimw@mysql.com
af88d67a19 Import BDB 4.4.16 2005-12-05 10:27:46 -08:00
jani@a193-229-222-105.elisa-laajakaista.fi
a13220472f Disabled test. 2005-12-05 13:33:46 +02: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
vtkachenko@quadxeon.mysql.com
c1854e67f0 Merge bk-internal:/home/bk/mysql-5.1-new
into quadxeon.mysql.com:/benchmarks/ext3/BUILDS/mysql-5.1-new
2005-12-02 12:02:38 +01:00
gluh@eagle.intranet.mysql.r18.ru
e9d70e4b97 Fix for bug#8294 Traditional: Misleading error message for invalid CAST to DATE
-issue more correct message for incorrect date|datetime|time values
  -ER_WARN_DATA_OUT_OF_RANGE message is changed
  -added new error message
2005-12-02 15:01:44 +04:00
vtkachenko@quadxeon.mysql.com
9149eea9a5 Merge 2005-12-02 11:53:01 +01:00
stewart@mysql.com
00d95a8bea BUG#15425 Small window for NF during backup failing without error 2005-12-02 09:27:06 +01:00
ramil@mysql.com
681252c82d Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/ram/work/5.0.b12956
2005-12-02 11:57:26 +04:00
bell@sanja.is.com.ua
c98fbc0320 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 08:43:05 +02:00
elliot@mysql.com
36c45752e3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/emurphy/src/mysql-5.1-new
2005-12-02 06:16:24 +01:00
elliot@mysql.com
66a5dfa62f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/users/emurphy/src/mysql-5.1-new
2005-12-02 01:23:26 +01:00
elliot@mysql.com
36936ecd64 BUG#15406: Adding support for transactions to blackhole.
Now when rolling back a transaction on a blackhole table,
the transaction will not be written to the binlog.
2005-12-02 01:11:49 +01:00
jimw@mysql.com
01ac5172dd Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2005-12-01 15:14:51 -08:00
jimw@mysql.com
3d223afb28 Post-merge result file cleanup 2005-12-01 15:10:35 -08:00
SergeyV@selena.
29941c07ed Merge selena.:H:/MYSQL/bkt/mysql-5.0
into  selena.:H:/MYSQL/bkt/mysql-5.1
2005-12-01 23:47:44 +03:00