Commit graph

34470 commits

Author SHA1 Message Date
mtaylor@qualinost.(none)
d394d66d28 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-01-29 12:28:25 -05:00
msvensson@pilot.mysql.com
07df8fd469 Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 16:12:12 +01:00
msvensson@pilot.mysql.com
007d170ad2 Merge pilot.mysql.com:/home/msvensson/mysql/bug22943/my41-bug22943
into  pilot.mysql.com:/home/msvensson/mysql/bug22943/my50-bug22943
2007-01-29 14:33:53 +01:00
msvensson@pilot.mysql.com
7eaa82ea38 Bug#22943 syscall pruning in libmysql
- Set the timeout values only where needed
2007-01-29 14:31:48 +01:00
msvensson@pilot.mysql.com
84947802c1 Merge pilot.mysql.com:/home/msvensson/mysql/bug19474/my50-bug19474
into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint
2007-01-29 12:27:11 +01:00
msvensson@pilot.mysql.com
d42b919a0b Bug#19474 readline bug: mysql: free(): invalid pointer
- Write to uninitialised memory occured since _rl_rapped_lines buffer
   was not extended in CHECK_INV_LBREAKS macro
 - Patch submitted to bug-readline@gnu.org
2007-01-29 12:24:08 +01:00
mtaylor@qualinost.(none)
f8f11eb2d9 Reverting change adding /etc/mysql support, as it breaks some installs. 2007-01-26 12:17:50 -08:00
mtaylor@qualinost.(none)
065ab1537a Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-01-26 12:13:59 -08:00
mtaylor@qualinost.(none)
58ae89cb76 User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0. 2007-01-26 12:00:38 -08:00
cmiller@zippy.cornsilk.net
f74992258a Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-m,c-gca
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-26 14:47:35 -05:00
cmiller@zippy.cornsilk.net
41179e6a8f Bug #25879: THD::options isn't set with ulonglong values and \
variables

Bits higher than 2**31 were impossible to set on THD::options.  It's
probably a remnant from a time when options was a 32-bit integer.

Now, use unsigned long-long constants and variables to set and clear
THD::options.
---
Pulled comments back to column 49.
2007-01-26 14:47:12 -05:00
kaa@polly.local
603475cbf9 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-01-25 15:47:19 +03:00
kaa@polly.local
c5a1c578f5 Merge polly.local:/tmp/maint/bug6774/my50-bug6774
into  polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-01-24 17:30:01 +03:00
iggy@recycle.(none)
54ce485557 Merge recycle.(none):/src/bug24496/my50-bug24496
into  recycle.(none):/src/mysql-5.0-maint
2007-01-24 09:29:50 -05:00
kaa@polly.local
645de0c5d7 Added a test case for bug #6774 "Replication fails with Wrong usage of DB GRANT and GLOBAL PRIVILEGES" 2007-01-24 16:45:30 +03:00
tsmith@quadxeon.mysql.com
52351353f3 Merge bk://localhost:5556
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-01-23 18:46:55 +01:00
tsmith@siva.hindu.god
9d2b85c221 Makefile.am: Fix bad merge: add 'cd mysql-test' to test-ps: target 2007-01-23 10:43:21 -07:00
iggy@recycle.(none)
a0c981d254 Bug#24496:Fresh install of mysql on windows has anonymous user with root access.
- Add anonymous user with no rights.
2007-01-23 10:01:56 -05:00
tsmith@quadxeon.mysql.com
b3f2b36ac0 Merge bk://localhost:5556
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/41
2007-01-23 02:45:59 +01:00
tsmith@quadxeon.mysql.com
28e8847ccd Merge bk://localhost:5556
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-01-23 02:43:57 +01:00
mtaylor@qualinost.(none)
2c26bc19bf Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
2007-01-22 09:07:53 -08:00
mtaylor@quadxeon.mysql.com
6758b720c0 Merge bk-internal:/home/bk/mysql-5.0-maint
into  quadxeon.mysql.com:/users/mtaylor/mysql-5.0-maint
2007-01-22 18:01:02 +01:00
msvensson@neptunus.(none)
f8623dc703 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-01-22 17:10:24 +01:00
msvensson@neptunus.(none)
1ebe4850d6 Import yaSSL version 1.5.8
- Includes patch for Bug#25189
2007-01-22 16:54:40 +01:00
msvensson@neptunus.(none)
4bb6151a7a Add define for used type of third argument to 'accept' - Netware uses size_t 2007-01-22 12:34:39 +01:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
4e6b8a1d6a Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/ram/work/b22026/b22026.5.0
2007-01-22 15:28:42 +04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
a079f20aa8 Fix for bug #22026: Warning when using IF statement and large unsigned bigint
We use INT_RESULT type if all arguments are of type INT for 'if', 'case', 
'coalesce' functions regardless of arguments' unsigned flag, so sometimes we can
exceed the INT bounds.
2007-01-22 14:52:23 +04:00
msvensson@neptunus.(none)
6db5790c2b gen_lex_hash does not need to link with odbc32*.lib 2007-01-22 10:41:36 +01:00
msvensson@neptunus.(none)
742af1c2a7 Merge bk-internal:/home/bk/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-01-22 10:37:59 +01:00
knielsen@ymer.(none)
854ef6b0a3 Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint
into  ymer.(none):/usr/local/mysql/x/mysql-5.0-maint
2007-01-22 08:59:26 +01:00
knielsen@ymer.(none)
4d7a8de047 Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint
into  ymer.(none):/usr/local/mysql/x/mysql-4.1-maint
2007-01-22 08:58:49 +01:00
tsmith@siva.hindu.god
6cb4282fd8 Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41
into  siva.hindu.god:/home/tsmith/m/inno/jan20/50
2007-01-21 20:05:21 -07:00
tsmith@siva.hindu.god
70119a1627 Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41
into  siva.hindu.god:/home/tsmith/m/inno/jan20/50
2007-01-21 20:02:24 -07:00
tsmith@siva.hindu.god
b448b62278 Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots
Fixes:
- Bug #24299: 
- Bug #25596:
2007-01-21 19:55:17 -07:00
tsmith@siva.hindu.god
7ce6170cf9 Applied innodb-5.0-ss1230 snapshot
Fixes:
- Bug #25596:
2007-01-21 17:58:02 -07:00
mtaylor@qualinost.(none)
d9366f9743 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
2007-01-19 17:36:05 -08:00
mtaylor@qualinost.(none)
72a6096eb4 Moving version-script to acinclude.m4 2007-01-19 17:34:47 -08:00
mtaylor@qualinost.(none)
dab88cfaa3 Fixed the make distcheck problem. We only really need to create libndb.ver if we are building Ndb. 2007-01-19 16:54: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)
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
mtaylor@qualinost.(none)
a53b50d021 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
2007-01-19 11:50:59 -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)
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
20faa77a5f Rearrange disable_warnings to enclose the warning emitters properly. 2007-01-19 10:33:07 -05:00
msvensson@neptunus.(none)
3b0caab561 Add test's from Matthias for assigning one variable from another using let 2007-01-19 15:43:21 +01: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
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