1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,365 Commits 3,050 Branches 357 Tags
Commit Graph

16365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
unknown
52da7eb858 Reuse more code: two equal pieces for ENUM and SET where moved 
into a function.
 2004-10-26 09:13:52 +05:00
unknown
9c07c7b805 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
 2004-10-25 20:52:46 +00:00
unknown
d58a17836c Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
 2004-10-25 20:49:09 +00:00
unknown
f4295a0537 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2004-10-25 22:35:47 +02:00
unknown
c436a91c76 fix for alignment bug on solaris 64 bit 
removed compiler warning


ndb/src/ndbapi/NdbIndexOperation.cpp:
  fix for alignment bug on solaris 64 bit
ndb/src/ndbapi/NdbOperationSearch.cpp:
  fix for alignment bug on solaris 64 bit
sql/ha_ndbcluster.cc:
  removed compiler warning
 2004-10-25 20:35:46 +00:00
unknown
2df0eca2b6 Change 'Build-tools/mysql-copyright' to ensure the receiving machines will build 
without trying to re-run autotools.


Build-tools/mysql-copyright:
  The top level Makefile will try to re-run the autotools unless the timestamps of the
  relevant files are in truly ascending order. Ensure this order!
 2004-10-25 22:15:45 +02:00
unknown
2d8ce69ed0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1-ndb 
into mysql.com:/home/jonas/src/mysql-4.1-ndb


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
 2004-10-25 18:02:42 +02:00
unknown
e60ea455e3 removed usage od NDB_MUTEX_INITIALIZER 2004-10-25 16:02:41 +00:00
unknown
7e39126de8 removed usage of NDB_MUTEX_INITIALIZER 2004-10-25 15:21:49 +00:00
unknown
8fb29e5d00 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2004-10-25 14:59:33 +02:00
unknown
5a941fb941 - fixed typo in innobase/os/os0file.c that caused the Windows build to fail 
innobase/os/os0file.c:
   - fixed typo that caused the Windows build to fail
 2004-10-25 14:55:44 +02:00
unknown
712326d684 Bug#6202: ENUMs are not case sensitive even if declared BINARY 2004-10-25 17:51:26 +05:00
unknown
7df4148084 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
 2004-10-25 11:38:30 +00:00
unknown
ad2a55c27e removed compiler warning 2004-10-25 11:30:33 +00:00
unknown
cb365f99b3 removed compiler warning 
shortened help text


ndb/tools/select_all.cpp:
  removed compiler warning
 2004-10-25 10:23:45 +00:00
unknown
760f69c1cb using my_gethostbyname_r in Ndb_getInAddr 2004-10-25 10:19:45 +00:00
unknown
28db20e481 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-10-25 10:26:29 +02:00
unknown
37c3702483 don't hang if the text contains illegal characters 2004-10-25 10:23:38 +02:00
unknown
3dee030ff9 remove compile warning 2004-10-24 15:25:43 +00:00
unknown
a2bf4dc3ce Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-24 15:09:56 +00:00
unknown
90f0161e9b removed compiler warnings 2004-10-24 15:09:18 +00:00
unknown
ed744fa079 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
 2004-10-24 11:58:25 +03:00
unknown
ba82d5b1f1 removed unneed variable 2004-10-24 11:54:58 +03:00
unknown
9abe7d272b Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0


sql/sql_parse.cc:
  Auto merged
 2004-10-24 11:32:08 +03:00
unknown
4c06b4aed7 Fixed BUG#6029: Stored procedure specific handlers should have priority. 
mysql-test/r/sp.result:
  New test case for BUG#6022.
mysql-test/t/sp.test:
  New test case for BUG#6022.
sql/sp_rcontext.cc:
  Find the most specific condition handler, not just the first one.
  (And corrected the return type for find_handler)
sql/sp_rcontext.h:
  Corrected return type for find_handler.
 2004-10-23 14:23:32 +02:00
unknown
d925bcd8d6 Fixed BUG#6022: Stored procedure shutdown problem with self-calling function. 
Fixed the pre-caching of functions. It now gives the expected stack overrun
  error for functions recursing too deep.


mysql-test/r/sp.result:
  New test case for BUG#6022.
mysql-test/t/sp.test:
  New test case for BUG#6022.
sql/sp.cc:
  Cache function first, then recurse, or the pre-caching loops infinitely
  for recursive functions.
 2004-10-23 13:30:05 +02:00
unknown
f1a132c3ee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb
 2004-10-23 09:06:15 +00:00
unknown
5ae770339b remove compiler warnings 2004-10-23 09:05:24 +00:00
unknown
814d720ed9 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 
into sanja.is.com.ua:/home/bell/mysql/bk/work-sub-4.1


sql/sql_parse.cc:
  Auto merged
 2004-10-23 10:27:34 +03:00
unknown
9f1751c5b6 ctype-utf8.c: 
Char is unsigned by defeault on some platforms. Cast t to a signed type.


strings/ctype-utf8.c:
  Char is unsigned by defeault on some platforms. Cast t to a signed type.
 2004-10-23 10:24:59 +05:00
unknown
08c39dd283 Fixed wrong range test code for HEAP tables. This caused a crash when doing a range test with a key that didn't have lower or upper bound (Bug #6082) 
More test cases



mysql-test/r/heap.result:
  Test for bug #6082 (delete with NOT NULL)
mysql-test/r/key.result:
  More tests for BUG#6151 - myisam index corruption
mysql-test/r/ps.result:
  Test of bug #6047 "Permission problem when executing mysql_stmt_execute with derived table"
mysql-test/t/heap.test:
  Test for bug #6082 (delete with NOT NULL)
mysql-test/t/key.test:
  More tests for BUG#6151 - myisam index corruption
mysql-test/t/ps.test:
  Test of bug #6047 "Permission problem when executing mysql_stmt_execute with derived table"
sql/ha_heap.cc:
  Fixed wrong range test code for HEAP tables. This caused a crash when doing a range test with a key that didn't have lower or upper bound
 2004-10-23 03:30:27 +03:00
unknown
371301d786 configure.in: 
4.1.7 leaves gamma.


configure.in:
  4.1.7 leaves gamma.
 2004-10-22 17:25:02 -05:00
unknown
9c300fe66c test fixed 2004-10-22 23:23:02 +02:00
unknown
c9a2d60706 merged 2004-10-22 23:15:08 +02:00
unknown
d23e048c17 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/sql_parse.cc:
  Auto merged
 2004-10-22 22:44:08 +02:00
unknown
2c32fdc67c correct fix for the bug #6151 2004-10-22 22:42:11 +02:00
unknown
c6b5d24abf Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug6151
 2004-10-22 22:34:59 +02:00
unknown
d871ea8aa8 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2004-10-22 22:29:43 +02:00
unknown
060fc681ab - applied portability fix for Windows (1ULL -> ULL(1)) to myisampack.c 
myisam/myisampack.c:
   - applied portability fix for Windows (1ULL -> ULL(1))
 2004-10-22 22:26:57 +02:00
unknown
5ab6c5e532 postreview fixes 
sql/mysql_priv.h:
  constant definition
sql/sql_base.cc:
  difine used instead of constant
sql/sql_cache.cc:
  difine used instead of constant
  typo fixed
 2004-10-22 22:51:04 +03:00
unknown
0c7ac260e0 sql_acl.cc: 
Correcting problem with merge


sql/sql_acl.cc:
  Correcting problem with merge
 2004-10-22 14:32:23 -05:00
unknown
6ffd23d61f Merge dellis@bk-internal.mysql.com:/home/bk/mysql-4.1 
into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1
 2004-10-22 14:21:35 -05:00
unknown
8f06815657 After-merge fixes. 2004-10-22 14:19:42 -05:00
unknown
a6efe82fee Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.0
 2004-10-22 22:10:52 +03:00
unknown
b8847967c8 Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.0
 2004-10-22 22:08:46 +03:00
unknown
450b9a170d Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-bug6151
 2004-10-22 21:07:09 +02:00
unknown
7275d29eb9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/media/sda1/mysql/mysql-4.1-6088
 2004-10-22 23:06:24 +04:00
unknown
0798c99db1 Post merge fix (test results) 2004-10-22 23:05:48 +04:00
unknown
d73b379cd1 Updated view test result (after a warning's been removed). 
mysql-test/r/view.result:
  Updated test result (after a warning's been removed).
 2004-10-22 20:55:52 +02:00
unknown
61c1dd02f3 Manual merge 
mysql-test/r/ps.result:
  Manual merge.
 2004-10-22 22:55:49 +04:00