mtaylor@qualinost.(none)
d29c6a2547
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-19 14:30:41 -08:00
mtaylor@qualinost.(none)
d116ff2973
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
---
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
---
I cut and pasted in the wrong direction I think. We don't have storage until 5.1...
---
missed storage in one more place
---
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
---
added storage back to patch after merge from 5.0-maint
---
Removed ndb/src dir and libndb.ver.in from it that got introduced from the 5.0-maint merge.
2007-01-19 14:29:01 -08:00
mtaylor@qualinost.(none)
8e6f3ab33b
Added libndb.ver to BUILT_SOURCES to force it to get removed during make distclean
2007-01-19 14:26:06 -08:00
mtaylor@qualinost.(none)
8b1fe92d93
missed storage in one more place
2007-01-19 12:27:59 -08:00
mtaylor@qualinost.(none)
4d9abb4a4f
I cut and pasted in the wrong direction I think. We don't have storage until 5.1...
2007-01-19 12:23:06 -08:00
mtaylor@qualinost.(none)
58d09b5403
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-19 12:01:52 -08:00
mtaylor@qualinost.(none)
9477996337
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-01-19 12:00:19 -08:00
iggy@recycle.(none)
205f7a0583
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-19 13:20:52 -05:00
iggy@recycle.(none)
0343fd801c
Merge recycle.(none):/src/bug22807/my51-bug22807
...
into recycle.(none):/src/mysql-5.1-maint
2007-01-19 13:19:12 -05:00
iggy@recycle.(none)
d6d5195cbd
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/bug22807/my51-bug22807
2007-01-19 13:11:03 -05:00
iggy@recycle.(none)
d3e6cb6b3b
Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
...
- Corrected compiler warnings and performance problems with new
dynstr_append_os_quoted function.
2007-01-19 13:09:48 -05:00
cmiller@zippy.cornsilk.net
80e1798521
Add missing version delimiter.
2007-01-19 11:30:40 -05:00
cmiller@zippy.cornsilk.net
aaa7257b02
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-19 11:10:38 -05:00
cmiller@zippy.cornsilk.net
20faa77a5f
Rearrange disable_warnings to enclose the warning emitters properly.
2007-01-19 10:33:07 -05:00
cmiller@zippy.cornsilk.net
e297ac6699
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-01-19 09:03:32 -05:00
cmiller@zippy.cornsilk.net
85eb07ff98
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-19 08:56:33 -05:00
cmiller@zippy.cornsilk.net
a8ff939d83
The rpl tree added a test case, and another source added a warning,
...
and combined, they add a platform-specific warning. The warnings
are not the goal of the test, in any case.
2007-01-19 08:56:06 -05:00
kaa@polly.local
4b36a96ed5
Merge polly.local:/tmp/maint/bug23814/my51-bug23814
...
into polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-01-19 14:29:18 +03:00
kaa@polly.local
71a292cac1
Fix for the bug #23814 "mysqlimport crashes"
...
mysqlimport.c declared the opt_use_threads variable as my_bool, but the corresponding option was defined as GET_UINT. The problem only occured on architectures with strict alignment rules.
2007-01-19 14:14:11 +03:00
msvensson@pilot.mysql.com
4dbfac2a5c
Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-01-19 11:12:24 +01:00
msvensson@pilot.mysql.com
b1a9115d88
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-19 11:11:34 +01:00
msvensson@pilot.mysql.com
f22549a8c0
Merge bk-internal:/home/bk/mysql-5.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
2007-01-19 11:10:16 +01:00
msvensson@pilot.mysql.com
2c60829f3b
Bug #15518 Reusing a stmt that has failed during prepare does not clear error
...
- Additional patch removing check for mysql_errno on already closed
mysql1
2007-01-19 11:07:20 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
ad42530481
after merge fix.
2007-01-19 12:15:44 +04:00
ramil/ram@mysql.com/myoffice.izhnet.ru
86322e269f
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my50-bug22533
2007-01-19 08:56:03 +04:00
ramil/ram@myoffice.izhnet.ru
1b488c7fbe
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into mysql.com:/usr/home/ram/work/bug22533/my51-bug22533
2007-01-19 08:54:10 +04:00
mtaylor@qualinost.(none)
d1df54b1db
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-18 16:32:21 -08:00
mtaylor@qualinost.(none)
3384251146
Add code to actually version the symbols in the library, and not just the library. bug #13522
2007-01-18 16:31:43 -08:00
mtaylor@qualinost.(none)
3fdf318ef6
Added configure section to deal with actually versioning symbols.
2007-01-18 16:28:47 -08:00
mtaylor@qualinost.(none)
1dc919a0ed
Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-01-18 16:26:31 -08:00
mtaylor@qualinost.(none)
fd75030f93
Added version script information to actually version the symbols.
2007-01-18 16:21:43 -08:00
mtaylor@qualinost.(none)
e4b3708e2c
Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-18 15:12:57 -08:00
cmiller@zippy.cornsilk.net
d0a2f4d9b8
Fix merge problem.
2007-01-18 18:02:58 -05:00
mtaylor@qualinost.(none)
c546e4bfe1
Incrementing soname to 2 for 5.0 branch.
2007-01-18 14:21:50 -08:00
mtaylor@qualinost.(none)
d67fa30c21
Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
...
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-01-18 14:16:56 -08:00
mtaylor@qualinost.(none)
7d2d130748
Adding support for versioned libndbclient.so. bug #13522
2007-01-18 13:30:01 -08:00
tsmith@siva.hindu.god
f4354a87d7
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 13:27:51 -07:00
tsmith@siva.hindu.god
f135f34ebc
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 13:26:48 -07:00
tsmith@siva.hindu.god
f5aab8b213
ndb_types.test: sleep a bit longer, to ensure that timestamp > @now
2007-01-18 13:26:26 -07:00
tsmith@siva.hindu.god
dac5bb3819
Makefile.am: Fix previous bad merge. Re-enable the test-ps target.
2007-01-18 13:15:16 -07:00
tsmith@siva.hindu.god
1d72994246
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:38:49 -07:00
tsmith@siva.hindu.god
f3d321a2af
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:37:45 -07:00
tsmith@siva.hindu.god
5817465426
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/40
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
2007-01-18 10:36:46 -07:00
tsmith@siva.hindu.god
1fbf01baf0
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:34:51 -07:00
tsmith@siva.hindu.god
02ddf3d04c
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:33:28 -07:00
tsmith@siva.hindu.god
6b729ff2cd
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:30:39 -07:00
tsmith@siva.hindu.god
244b2004ee
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
2007-01-18 10:06:36 -07:00
tsmith@siva.hindu.god
6fd02a439f
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/41
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
2007-01-18 09:53:30 -07:00
iggy@recycle.(none)
294af0a42e
Merge recycle.(none):/src/bug22807/my50-bug22807
...
into recycle.(none):/src/mysql-5.0-maint
2007-01-18 11:46:29 -05:00
iggy@recycle.(none)
1b32febd2e
Merge recycle.(none):/src/bug22807/my51-bug22807
...
into recycle.(none):/src/mysql-5.1-maint
2007-01-18 11:43:55 -05:00
