mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15643 commits 2784 branches 343 tags 1.6 GiB
Commit graph

15643 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
61c1dd02f3 Manual merge 
mysql-test/r/ps.result:
  Manual merge.
 2004-10-22 22:55:49 +04:00
unknown
cac908520c Manual merge of fix for bug #6081 "Call to deprecated mysql_create_db() 
function crashes server" with main tree.
 2004-10-22 22:51:55 +04:00
unknown
9b5cf9464c A fix and test case for Bug#6088 "FOUND_ROWS returns wrong values for 
prepared statements when LIMIT is used" and post-review comments.
The fix changes the approach we calculate the need for ORDER BY 
in UNION: the previous was not PS friendly, as it damaged SELECT_LEX 
options in case of single select.


mysql-test/r/ps.result:
  Test results fixed: the test case for Bug#6088
mysql-test/r/subselect.result:
  Test results fixed: now we don't perform ORDER BY for parts of UNION
  if there is no LIMIT clause.
mysql-test/t/ps.test:
  A test case for Bug#6088 "FOUND_ROWS returns wrong values for
   prepared statements when LIMIT is used".
sql/sql_union.cc:
  The actual fix for Bug#6088:
  - don't modify SELECT_LEX'es
  - use boolean variable can_skip_order_by to check if we can skip
    ORDER BY in UNION
 2004-10-22 22:51:16 +04:00
unknown
9df51cf3c3 sql_acl.cc: 
BUG #5831  Post-review changes, merging improvements from Monty.


sql/sql_acl.cc:
  BUG #5831  Post-review changes, merging improvements from Monty.
 2004-10-22 13:41:40 -05:00
unknown
1e9bf28ba4 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 20:34:25 +02:00
unknown
be6e299abb added missing command names to command_name[] array 2004-10-22 20:33:10 +02:00
unknown
1b142600fe Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-bg6081


sql/sql_parse.cc:
  Auto merged
 2004-10-22 20:59:00 +04:00
unknown
2f8b0ab3a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1


sql/item.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
 2004-10-22 19:51:04 +03:00
unknown
af84ae0097 After merge fixes 2004-10-22 19:50:31 +03:00
unknown
6a93166799 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-tzfix
 2004-10-22 20:21:57 +04:00
unknown
85d04ccebd Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


myisam/myisamchk.c:
  Auto merged
 2004-10-22 18:21:56 +02:00
unknown
c8ef55cc41 Manual merge of fix for bug #6081 "Call to deprecated mysql_create_db() function crashes 
server" with main tree.


sql/sql_parse.cc:
  Auto merged
 2004-10-22 20:21:56 +04:00
unknown
1cd249e0ed Followup to fix for bug#6050: fix valgrind warnings. 
sql/item.cc:
  Fix valgrind errors: we need Item::name to point to PS memory
  as well.
sql/item.h:
  set_field no longer can be reused as is for PS purposes.
sql/sql_union.cc:
  Item_field::set_field -> Item_field::reset_field.
 2004-10-22 20:21:55 +04:00
unknown
f94128716c merge 
client/mysqltest.c:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  merge (use new code)
 2004-10-22 19:21:55 +03:00
unknown
4ff9b60597 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/dlenev/src/mysql-4.1-tzfix


sql/sql_parse.cc:
  Auto merged
 2004-10-22 20:21:55 +04:00
unknown
4edadc7949 Fixed a bug in vis.c 
cmd-line-utils/libedit/np/vis.c:
  Fixed a compiler issue for QNX.
 2004-10-22 19:21:54 +03:00
unknown
1cbad77b8e Merge mysql.com:/home/bk/mysql-4.1 
into mysql.com:/build/mysqldev/my/mysql-4.1-tomastest


ndb/tools/waiter.cpp:
  Auto merged
 2004-10-22 18:21:53 +02:00
unknown
bdf4e17f85 Merge mysql.com:/home/bk/mysql-4.1 
into mysql.com:/users/kboortz/daily/work/mysql-4.1-sjis
 2004-10-22 18:21:52 +02:00
unknown
236e588a73 removing compiler warnings 2004-10-22 16:21:51 +00:00
unknown
1c67dea5ae Merge mysql.com:/home/my/mysql-4.0 into mysql.com:/home/my/mysql-4.1 
sql/sql_parse.cc:
  Auto merged
 2004-10-22 18:46:35 +03:00