Commit graph

34456 commits

Author SHA1 Message Date
unknown
8da25f3abc 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
unknown
5c8f3d0769 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
unknown
aac1ec2f5e Merge recycle.(none):/src/bug24496/my50-bug24496
into  recycle.(none):/src/mysql-5.0-maint


scripts/mysql_create_system_tables.sh:
  Auto merged
2007-01-24 09:29:50 -05:00
unknown
7d4477f866 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
unknown
2e1a889512 Merge bk://localhost:5556
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-01-23 18:46:55 +01:00
unknown
df5030c49a Makefile.am: Fix bad merge: add 'cd mysql-test' to test-ps: target
Makefile.am:
  Fix bad merge: add 'cd mysql-test' to test-ps: target
2007-01-23 10:43:21 -07:00
unknown
b60c146a89 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
unknown
ed25e71db2 Merge bk://localhost:5556
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50


mysql-test/r/range.result:
  Auto merged
sql/item.cc:
  Auto merged
2007-01-23 02:43:57 +01:00
unknown
0e8d29031e 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
unknown
1e00143d42 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
unknown
5e50052234 Import yaSSL version 1.5.8
- Includes patch for Bug#25189


extra/yassl/README:
  Import patch yassl.diff
extra/yassl/include/openssl/ssl.h:
  Import patch yassl.diff
extra/yassl/src/make.bat:
  Import patch yassl.diff
extra/yassl/src/ssl.cpp:
  Import patch yassl.diff
extra/yassl/src/yassl_error.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/benchmark/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/include/asn.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/error.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/include/file.hpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/asn.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/coding.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/integer.cpp:
  Import patch yassl.diff
extra/yassl/taocrypt/src/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/test/make.bat:
  Import patch yassl.diff
extra/yassl/taocrypt/test/test.cpp:
  Import patch yassl.diff
extra/yassl/testsuite/make.bat:
  Import patch yassl.diff
extra/yassl/testsuite/testsuite.cpp:
  Import patch yassl.diff
2007-01-22 16:54:40 +01:00
unknown
1d82eb04dd Add define for used type of third argument to 'accept' - Netware uses size_t 2007-01-22 12:34:39 +01:00
unknown
4032f2b5f1 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
unknown
39fb7b2423 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.


mysql-test/r/select.result:
  Fix for bug #22026: Warning when using IF statement and large unsigned bigint
    - test result.
mysql-test/t/select.test:
  Fix for bug #22026: Warning when using IF statement and large unsigned bigint
    - test case.
sql/item_cmpfunc.cc:
  Fix for bug #22026: Warning when using IF statement and large unsigned bigint
    - take into account unsigned flags aggregating result types:                    
      return INT_RESULT only if two items with INT_RESULT type                      
      have equal unsigned_flags, otherwise return REAL_RESULT.
2007-01-22 14:52:23 +04:00
unknown
332186b639 gen_lex_hash does not need to link with odbc32*.lib 2007-01-22 10:41:36 +01:00
unknown
4bf4bf1386 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
unknown
fdb1dcae4e Merge ymer.(none):/usr/local/mysql/mysql-4.1-maint
into  ymer.(none):/usr/local/mysql/x/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
2007-01-22 08:59:26 +01:00
unknown
49b814e5f5 Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41
into  siva.hindu.god:/home/tsmith/m/inno/jan20/50


innobase/dict/dict0dict.c:
  Use local
2007-01-21 20:05:21 -07:00
unknown
83203e6e38 Merge siva.hindu.god:/home/tsmith/m/inno/jan20/41
into  siva.hindu.god:/home/tsmith/m/inno/jan20/50


mysql-test/r/range.result:
  Auto merged
sql/item.cc:
  Auto merged
2007-01-21 20:02:24 -07:00
unknown
47555a079a Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots
Fixes:
- Bug #24299: 
- Bug #25596: 


innobase/dict/dict0dict.c:
  Applied innodb-4.1-ss36 and innodb-4.1-ss38 snapshots
  
  Revision r36:
  innodb-4.1: Port r1030 from innodb/branches/5.0:
  
  Replace isspace() with a wrapper ib_isspace(), because on
  Win32 isspace(0xa0) appears to hold.  (Bug #24299)
  
  
  Revision r38:
  ib_isspace(c): Check for c being the null character.  (Bug #25596)
2007-01-21 19:55:17 -07:00
unknown
b238db620b Applied innodb-5.0-ss1230 snapshot
Fixes:
- Bug #25596: 


innobase/dict/dict0dict.c:
  Applied innodb-5.0-ss1230 snapshot.
  
  r1230
  
  branches/5.0: ib_isspace(c): Check for c being the null character.
  (Bug #25596)
sql/ha_innodb.h:
  Applied innodb-5.0-ss1230
  
  Trivial indent SPACES -> TAB change.
2007-01-21 17:58:02 -07:00
unknown
4290283149 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


mysql-test/r/range.result:
  Auto merged
sql/item.cc:
  Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
  Auto merged
configure.in:
  SCCS merged
2007-01-19 17:36:05 -08:00
unknown
23bd0ead25 Moving version-script to acinclude.m4 2007-01-19 17:34:47 -08:00
unknown
5eeee409e7 Fixed the make distcheck problem. We only really need to create libndb.ver if we are building Ndb.
config/ac-macros/ha_ndbcluster.m4:
  We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4
configure.in:
  We only need to create this file if we are building Ndb in the first place. Moving the code to ha_ndbcluster.m4
ndb/src/Makefile.am:
  BUILT_SOURCES is uneccesary. Removing it. The real problem was related to building or not building Ndb.
2007-01-19 16:54:01 -08:00
unknown
74eac22e4e Added libndb.ver to BUILT_SOURCES to force it to get removed during make distclean
BitKeeper/etc/ignore:
  Added ndb/src/libndb.ver to the ignore list
2007-01-19 14:26:06 -08:00
unknown
13e0db68ce missed storage in one more place 2007-01-19 12:27:59 -08:00
unknown
1e07dbd126 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
unknown
5e2bf245bd 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
unknown
4f3528be1f 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
unknown
644e6c7fdd Merge recycle.(none):/src/bug22807/my50-bug22807
into  recycle.(none):/src/mysql-5.0-maint


mysys/string.c:
  Auto merged
2007-01-19 13:20:52 -05:00
unknown
4032c303a9 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.


mysys/string.c:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Fix compiler warnings.
  - Used dynstr_append_mem where string length is known.
2007-01-19 13:09:48 -05:00
unknown
3271e716b2 Rearrange disable_warnings to enclose the warning emitters properly. 2007-01-19 10:33:07 -05:00
unknown
51942b7efe Add test's from Matthias for assigning one variable from another using let 2007-01-19 15:43:21 +01:00
unknown
636a5b3fa4 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
unknown
df1b824262 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.


mysql-test/t/ps.test:
  Quash platform-specific warnings.
2007-01-19 08:56:06 -05:00
unknown
0c10457ec4 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
unknown
d6e4472f89 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


tests/mysql_client_test.c:
  No need to check mysql_errno of mysql1 which has already been closed.
2007-01-19 11:07:20 +01:00
unknown
e167d79e80 Implement mysql-test-run.pl option to limit the number of saved core
files. This helps stability of multiple parallel automated test runs,
avoiding the situation where one bad build fills up disk with 1000s of
core files, causing failures in other test runs.
2007-01-19 09:41:08 +01:00
unknown
7f5bcdaaa5 after merge fix.
mysql-test/r/range.result:
  Fix for bug #22533: Traditional: Too-long bit value not rejected.
    - results adjusted.
2007-01-19 12:19:53 +04:00
unknown
adfe34d91e Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint
into  mysql.com:/usr/home/ram/work/bug22533/my41-bug22533
2007-01-19 09:12:52 +04:00
unknown
fd534e03a6 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
2007-01-19 08:56:03 +04:00
unknown
687f6b2225 Added configure section to deal with actually versioning symbols. 2007-01-18 16:28:47 -08:00
unknown
f9146c1595 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


ndb/src/Makefile.am:
  Auto merged
configure.in:
  Difficult merge - will do by hand.
2007-01-18 16:26:31 -08:00
unknown
8f16a25556 Added version script information to actually version the symbols.
ndb/src/libndb.ver.in:
  BitKeeper file /home/mtaylor/src/mysql-4.1-maint/ndb/src/libndb.ver.in
2007-01-18 16:21:43 -08:00
unknown
90387cd4d2 Incrementing soname to 2 for 5.0 branch. 2007-01-18 14:21:50 -08:00
unknown
114ac656a0 Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


configure.in:
  Auto merged
ndb/src/Makefile.am:
  Auto merged
2007-01-18 14:16:56 -08:00
unknown
af3d6c48fb Adding support for versioned libndbclient.so. bug #13522
configure.in:
  Added variables to support ndbclient library versioning.
  Set version to 1.0.0 for 4.1
ndb/src/Makefile.am:
  Making use of new variables. Adding support for versioned libraries.
2007-01-18 13:30:01 -08:00
unknown
b8ae113892 Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41
into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


mysql-test/r/ndb_types.result:
  Auto merged
mysql-test/t/ndb_types.test:
  Auto merged
2007-01-18 13:26:48 -07:00
unknown
4fda992bff ndb_types.test: sleep a bit longer, to ensure that timestamp > @now
mysql-test/r/ndb_types.result:
  update results
mysql-test/t/ndb_types.test:
  Sleep a bit longer, to ensure that timestamp changes between:
  set @now = now();
  and:
  insert into/update t1
  
  Test case failed (select timestamp>@now from t1 ==> 0, should be 1), and passed when run again.  This should(?) avoid that fluke.
  
  Clean up test file a bit while I'm here.
2007-01-18 13:26:26 -07:00
unknown
d0cfcce458 Makefile.am: Fix previous bad merge. Re-enable the test-ps target.
Makefile.am:
  Fix previous bad merge.  Re-enable the test-ps target.
2007-01-18 13:15:16 -07:00