mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 22:12:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
53926 commits 2780 branches 343 tags 1.6 GiB
Commit graph

53926 commits

This branch
This branch
All branches
Author SHA1 Message Date
mleich@five.local.lan
756725ab93 Merge five.local.lan:/work/merge/mysql-5.1-funcs_1 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-09 16:05:58 +02:00
mleich@five.local.lan
963bb655c6 Additional tests inspired by Bug 
#12713 Error in a stored function called from a
          SELECT doesn't cause ROLLBACK of statem
 2008-04-09 15:56:25 +02:00
joerg@trift2.
0e6f1a731f Merge trift2.:/MySQL/M51/push-5.1 
into  trift2.:/MySQL/M51/work-5.1
 2008-04-05 13:37:05 +02:00
joerg@trift2.
fa63d5d165 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-05 12:51:38 +02:00
joerg@trift2.
cca2a8ec42 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/tmp-5.1
 2008-04-04 20:03:24 +02:00
joerg@trift2.
0d0b67d270 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/tmp-5.1

Null merge - changes specific to 5.1.24-rc are superseded by better ones done in parallel.
 2008-04-04 19:52:48 +02:00
joerg@trift2.
a5a1fef394 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-04 19:30:52 +02:00
joerg@trift2.
2092e0c004 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/tmp-5.1
 2008-04-04 19:25:39 +02:00
mleich@five.local.lan
5b6e85157b Merge five.local.lan:/work/merge/mysql-5.1-funcs_1 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-04 18:31:02 +02:00
mleich@five.local.lan
c780a0879a Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 
into  five.local.lan:/work/merge/mysql-5.1-funcs_1
 2008-04-04 18:27:37 +02:00
mleich@five.local.lan
7498f9e6b8 Backport of fix made in 5.1 to 5.0 
mysql-test/Makefile.am   :    Fix a copy-paste error ...
 2008-04-04 17:41:14 +02:00
mleich@five.local.lan
c7efce7e3b Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean 
into  five.local.lan:/work/merge/mysql-5.0-build
 2008-04-04 14:51:43 +02:00
mleich@five.local.lan
40092a7932 Merge five.local.lan:/work/trees/mysql-5.1-build-src-clean 
into  five.local.lan:/work/merge/mysql-5.1-build
 2008-04-04 14:50:46 +02:00
joerg@trift2.
a1173ad61b mysql-test/Makefile.am : Fix a copy-paste error ... 2008-04-04 13:21:40 +02:00
joerg@trift2.
27e226c69f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-04 12:12:03 +02:00
joerg@trift2.
e0b54b4817 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-04 10:26:41 +02:00
joerg@trift-lap.fambruehe
b7360593f1 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2008-04-03 20:58:22 +02:00
joerg@trift-lap.fambruehe
be2080f917 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2008-04-03 20:23:07 +02:00
cmiller@zippy.cornsilk.net
7b77e36909 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-03 13:21:02 -04:00
cmiller@zippy.cornsilk.net
7e78633f81 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my51-bug26294
 2008-04-03 13:14:57 -04:00
joerg@trift-lap.fambruehe
e9a27950ce Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2008-04-03 18:51:00 +02:00
cmiller@zippy.cornsilk.net
9ff7a0cedc Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3 
When linking with some external programs, "multiple definition 
of `init_time'"

Rename init_time() to my_init_time() to avoid collision with other
libraries (particularly libmng).
 2008-04-03 11:32:00 -04:00
cmiller@zippy.cornsilk.net
bb7d01f73d Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-03 11:30:38 -04:00
joerg@trift-lap.fambruehe
ff698f109a Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2008-04-03 17:23:59 +02:00
joerg@trift2.
1aa40adcc3 Merge trift2.:/MySQL/M50/push-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-03 15:40:17 +02:00
joerg@trift2.
e39ef7b013 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-03 15:35:33 +02:00
joerg@trift2.
c62e5bbe46 Merge trift2.:/MySQL/M50/mysql-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2008-04-03 15:30:39 +02:00
kent/mysqldev@mysql.com/production.mysql.com
c41a4e13f8 mysql.spec.sh: 
If excluding Federated, make sure dynamic plugin is not built
Makefile.am:
  Only run cluster test when compiled with cluster
lib_sql.cc:
  Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf()
 2008-04-02 22:24:53 +02:00
mleich@five.local.lan
9802854c97 Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-02 21:32:31 +02:00
mleich@five.local.lan
3e8657456a Merge five.local.lan:/work/merge/mysql-5.1-funcs_1 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-02 21:30:48 +02:00
mleich@five.local.lan
d14e25bf7b Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
 2008-04-02 21:29:43 +02:00
mleich@five.local.lan
cf8e6655ab Merge five.local.lan:/work/merge/mysql-5.0-funcs_1 
into  five.local.lan:/work/merge/mysql-5.1-funcs_1
 2008-04-02 20:24:07 +02:00
mleich@five.local.lan
c01918948c Correct the location of the directory for 
"funcs_1" data load
 2008-04-02 19:47:20 +02:00
cmiller@zippy.cornsilk.net
d0031df2be Replaced full-stop character in error message. 2008-04-02 12:18:21 -04:00
mleich@five.local.lan
4f4d10da03 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
 2008-04-02 14:55:35 +02:00
mleich@five.local.lan
a36a3fa266 Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-02 14:50:29 +02:00
kent/mysqldev@mysql.com/production.mysql.com
fd1bd7547a mysqld.cc: 
Corrects build problems embedded on Windows
Makefile.am:
  Install .sym or mysqld-debug if exists
query_cache_debug.test, query_cache_debug.result:
  Set more resonable query cache size (bug#35749)
CMakeLists.txt:
  Added missing stacktrace.c
 2008-04-02 00:43:17 +02:00
mleich@five.local.lan
79888f09ad Merge five.local.lan:/work/trees/mysql-5.0-build-src-clean 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-01 23:22:48 +02:00
mleich@five.local.lan
bc3b4a2cf9 Merge five.local.lan:/work/merge/mysql-5.1-Bug 
into  five.local.lan:/work/trees/mysql-5.1-build-src-clean
 2008-04-01 23:19:37 +02:00
mleich@five.local.lan
4822079f0a Merge five.local.lan:/work/merge/mysql-5.0-Bug 
into  five.local.lan:/work/trees/mysql-5.0-build-src-clean
 2008-04-01 23:03:23 +02:00
mleich@five.local.lan
4002e5c362 Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.1-release 
into  five.local.lan:/work/mysql-5.1-24-rc
 2008-04-01 19:29:29 +02:00
mleich@five.local.lan
1f26fe0815 Fixes for failing funcs_1 tests in mysql-5.1.24-rc 
Problems were caused by modifications of
- the server
  - HANDLER FOR SQLSTATE '00000' is now rejected (bug fix)
    affects several ..._storedproc* tests
  - improved error message
    affects the ..._trig_03e
  - improved content of information_schema.COLUMNS about
    information_schema.REFERENTIAL_CONSTRAINTS
    affects is_columns_is
- the content of the community build (collations)
    affects charset_collation_3
 2008-04-01 19:22:37 +02:00
mkindahl@dl145h.mysql.com
013fd23675 Post-merge fixes. 2008-04-01 18:50:35 +02:00
cmiller@zippy.cornsilk.net
2b0227f244 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-04-01 12:38:24 -04:00
cmiller@zippy.cornsilk.net
7a9f12e1c4 Test updated. 2008-04-01 12:26:12 -04:00
cmiller@zippy.cornsilk.net
15b1a5ff54 Bug#15776: 32-bit signed int used for length of blob 
Based on contributed patch from Martin Friebe, CLA from 2007-02-24.

The parser lacked support for field sizes after signed long,
when it should extend to 2**32-1.

Now, we correct that limitation, and also make the error handling
consistent for casts.
---
Fix minor complaints of Marc Alff, for patch against B-g#15776.
---
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
---
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
---
testing
 2008-04-01 12:19:20 -04:00
df@pippilotta.erinye.com
2dc1c7e2a1 Merge dev:my/mysql-5.1-release 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1.24-release
 2008-04-01 18:17:22 +02:00
joerg@trift2.
738dc9e040 Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-04-01 15:45:41 +02:00
mats@mats-laptop.(none)
984ea1a3cb Fixes to eliminate some race conditions in tests. 2008-04-01 14:40:23 +02:00
mleich@five.local.lan
414299f4de Post merge fix for 
ChangeSet@1.2583, 2008-03-31
   Merge five.local.lan:/work/merge/mysql-5.0-Bug
   into  five.local.lan:/work/merge/mysql-5.1-Bug
   Addditional manual fixes will be needed.
   MERGE: 1.1810.3667.16

   Which contains
      ChangeSet@1.1810.3667.16, 2008-03-31
      Fix for Bug
        #35335 funcs_1: Some tests fail within load_file during
                        pushbuild runs
   ...
 2008-04-01 13:18:31 +02:00