1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Commit Graph

2734 Commits

Author SHA1 Message Date
unknown
cae6ffdcee Fix for a bug #807 2003-07-09 15:52:51 +03:00
unknown
57043e331c Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0


sql/sql_parse.cc:
  Auto merged
2003-07-04 23:06:22 +03:00
unknown
778fec0c82 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-07-04 23:06:20 +03:00
unknown
4e61b75d8b Remove compiler warnings
Simple cleanup of previous pull


sql/item_strfunc.cc:
  Removed compiler warning
sql/sql_cache.cc:
  Indentation fix
sql/sql_handler.cc:
  Simple ptimization
sql/sql_parse.cc:
  Removed compiler warning
sql/log_event.h:
  Indentation fix
2003-07-04 23:06:19 +03:00
unknown
40feb0c617 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-04 22:06:19 +02:00
unknown
4e4ab26f53 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.r18.ru:/usr/home/ram/work/4.0
2003-07-05 01:06:18 +05:00
unknown
cdb44cd455 fixed bug #670 2003-07-04 16:06:17 -04:00
unknown
2848b0bed9 merge + order by (bug #515) temporary fix
properly fixed in 4.1
2003-07-04 14:42:57 +02:00
unknown
30341167c5 fix and test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows
mysql-test/r/handler.result:
  test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows
mysql-test/t/handler.test:
  test case for the bug #787: HANDLER without INDEX doesn't work with deleted rows
sql/sql_handler.cc:
  fix for the bug #787: HANDLER without INDEX doesn't work with deleted rows
2003-07-04 17:15:16 +05:00
unknown
b22a797631 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


sql/sql_handler.cc:
  Auto merged
2003-07-04 12:55:46 +02:00
unknown
4b50f4f252 handler should be used with constant expressions only (or rand) 2003-07-04 12:55:25 +02:00
unknown
62be5b0f61 Fixed memory/lock leak from bug fix 2003-07-04 11:06:58 +03:00
unknown
fd29a5bc19 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-07-04 03:40:11 +03:00
unknown
2d5d754c8c Status query on killed mysql connection results in segmentation fault (Bug #738)
Added MAX_PASSWORD_LENGTH. This increased master-slave passwords to 32 bytes (Bug #766)
Fixed server crash on purge master logs or show master logs when binlog is off. (Bug #733)


client/mysql.cc:
  status query on killed mysql connection results in segmentation fault (Bug #738)
configure.in:
  Portability fix for Unixware
include/my_global.h:
  Removed wrong patch from previous changeset
sql/mysql_priv.h:
  Added MAX_PASSWORD_LENGTH. This increased master-slave passwords to 32 bytes
sql/slave.h:
  Optimized structure
sql/sql_repl.cc:
  Memory overrun safety fixes (not critical)
  Fixed server crash on purge master logs or show master logs when binlog is off. (Bug #733)
sql/sql_repl.h:
  Fixed to use right define
strings/strmake.c:
  Fixed comment
2003-07-04 03:18:15 +03:00
unknown
3ee7174fc1 Fix for bug #676
A security leak with SHOW TABLES/ TABLE STATUS FROM db ...
2003-07-03 23:41:07 +03:00
unknown
a29adff6b8 ha_innodb.cc:
Since the mysql interactive client or some other phase in communication cuts > 64 kB strings to very short, restrict the output of SHOW INNODB STATUS to at most 60 kB


sql/ha_innodb.cc:
  Since the mysql interactive client or some other phase in communication cuts > 64 kB strings to very short, restrict the output of SHOW INNODB STATUS to at most 60 kB
2003-07-03 22:48:13 +03:00
unknown
5dc1e4b98a Many files:
Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush
os0sync.h, os0sync.c:
  Fix a bug in os_event on Unix: even though we signaled the event, some threads could continue waiting if the event became nonsignaled quickly again; this made group commit less efficient than it should be


innobase/os/os0sync.c:
  Fix a bug in os_event on Unix: even though we signaled the event, some threads could continue waiting if the event became nonsignaled quickly again; this made group commit less efficient than it should be
innobase/include/os0sync.h:
  Fix a bug in os_event on Unix: even though we signaled the event, some threads could continue waiting if the event became nonsignaled quickly again; this made group commit less efficient than it should be
innobase/log/log0log.c:
  Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush
innobase/include/log0log.h:
  Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush
innobase/srv/srv0srv.c:
  Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush
innobase/row/row0mysql.c:
  Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush
innobase/trx/trx0trx.c:
  Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush
sql/ha_innodb.cc:
  Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush
innobase/btr/btr0btr.c:
  Remove potential starvation of a full log buffer flush: only flush up to the lsn which was the largest at the time when we requested the full log buffer flush
2003-07-03 21:25:55 +03:00
unknown
db5283b306 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.739
2003-07-03 23:25:54 +05:00
unknown
33c416f67e Fix for #739
check for negative count in RPAD added


mysql-test/r/func_str.result:
  Appropriate result
mysql-test/t/func_str.test:
  testcase added
sql/item_strfunc.cc:
  we return NULL if count < 0
2003-07-03 23:24:23 +05:00
unknown
1f0d470463 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-07-03 21:04:34 +03:00
unknown
25cd10cb87 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-07-03 19:23:29 +03:00
unknown
abe124e76b Fix for UNIXWARE 7
Remove unaligned warnings on Ia64 from client library when using --host
Fix for replication when using many file descriptors 


include/my_global.h:
  Fix for UNIXWARE 7
libmysql/libmysql.c:
  Portability fix (removes unaligned warnings on Ia64)
mysql-test/r/symlink.result:
  Updated results
sql/mini_client.cc:
  Ported connect timeout code from libmysql.c
2003-07-03 19:23:06 +03:00
unknown
8d7eb4a0e5 Proposed fix for #751
Fields in key_expr (mysql_ha_read) wasn't linked to tables.
Hmm. How did it work at all?


mysql-test/r/alias.result:
  It's better to delete table after the test
mysql-test/r/handler.result:
  appropriate result
mysql-test/t/alias.test:
  it's better to drop table after test
mysql-test/t/handler.test:
  test case for #751
sql/sql_handler.cc:
  fix_fields called
2003-07-03 20:57:51 +05:00
unknown
dc0fb6ea48 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0
2003-07-03 19:02:11 +05:00
unknown
6805157498 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.717
2003-07-03 16:54:05 +05:00
unknown
c9dab0787c Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.0
into deer.(none):/home/hf/work/mysql-4.0.628


sql/item_strfunc.cc:
  Auto merged
2003-07-03 16:50:17 +05:00
unknown
a9df65e595 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


mysql-test/r/innodb.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2003-07-03 11:56:30 +03:00
unknown
2373397e13 Cleaner implementation if INSERT ... SELECT with same tables
Tests cleanup (put drop database first in tests)


client/mysql.cc:
  Cleanup of code in last pull
include/config-win.h:
  Remove HAVE_CHSIZE on windows as it's not 64 bit clean
include/my_global.h:
  Portability fix
mysql-test/r/drop.result:
  Clean up results
mysql-test/r/flush.result:
  Clean up results
mysql-test/r/grant_cache.result:
  Clean up results
mysql-test/r/innodb.result:
  Clean up results
mysql-test/r/insert_select.result:
  Clean up results
mysql-test/r/merge.result:
  Clean up results
mysql-test/r/query_cache.result:
  Clean up results
mysql-test/t/drop.test:
  Clean up tests
mysql-test/t/flush.test:
  Clean up tests
mysql-test/t/grant_cache.test:
  Clean up tests
mysql-test/t/innodb.test:
  Clean up tests
mysql-test/t/insert_select.test:
  Added more tests
mysql-test/t/merge.test:
  Test of bug 515
mysql-test/t/query_cache.test:
  Clean up tests
mysql-test/t/symlink.test:
  Clean up tests
sql/mysql_priv.h:
  Cleaner implementation if INSERT ... SELECT with same tables
sql/sql_lex.h:
  Cleaner implementation if INSERT ... SELECT with same tables
sql/sql_list.h:
  Indentation cleanup
sql/sql_parse.cc:
  Cleaner implementation if INSERT ... SELECT with same tables
sql/sql_yacc.yy:
  Cleaner implementation if INSERT ... SELECT with same tables
2003-07-03 11:55:36 +03:00
unknown
d433fe5580 Proposed bugfix for #717
Current table is placed into read_tables set of the current join_tab->select
so get_mm_parts function thinks that current table's record is read and
tries to calculate WHERE condition with the fields of the record.
Result of these calculations is unpredictable.
Looks funny - outcome of the SELECT depends on the queries executed before.

Anyway i think we should have testcase on this part of the code.


mysql-test/r/sel000001.result:
  appropriate result added
mysql-test/t/sel000001.test:
  testcase added
sql/sql_select.cc:
  I think we should count current table out of read_tables set
2003-07-03 10:42:13 +05:00
unknown
e22a31f173 I committed the same changeset in my tree yesterday, but broke the tree since,
so I commit again in a fresh tree.
Fix for bug#763 (Relay_log_space too big by 4 bytes),
plus comments and DBUG_PRINT, and we don't start replication
if --bootstrap.


mysql-test/r/rpl_log.result:
  Result update
mysql-test/r/rpl_log_pos.result:
  Result update
sql/mysqld.cc:
  Don't start replication if in bootstrap mode (bootstrap isn't supposed to have
  several threads).
sql/slave.cc:
  Fix for bug 763 (Relay_log_space too big by 4 bytes).
  A DBUG_PRINT.
sql/sql_acl.cc:
  Replaced a return by DBUG_RETURN (happened to find this reading a debug log).
sql/sql_repl.cc:
  A comment.
2003-07-03 01:08:36 +02:00
unknown
c0eb448582 Added missing (char*) casts in bzero calls.
(Needed for platforms with the traditional bzero prototype.)
Fixes BUG#460.
2003-07-03 01:08:34 +02:00
unknown
cb151c2ab7 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-03 01:08:32 +02:00
unknown
34b4da78bc add comment for BUG 672 2003-07-02 19:08:31 -04:00
unknown
4872adb663 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-02 23:37:24 +02:00
unknown
8c113acf96 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.0
into eagle.mysql.r18.ru:/home/vva/work/BUG_672/mysql-4.0


client/mysqlbinlog.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
2003-07-02 17:37:23 -04:00
unknown
71373afb5c fixed bug #672
client/mysqlbinlog.cc:
  changed format of eof-packet for protocol 4.1
2003-07-02 16:56:27 -04:00
unknown
7bb4166a9a bug #504: in "datetime op int" comparison int wasn't converted to datetime 2003-07-02 17:12:50 +02:00
unknown
fd693194c9 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-07-02 15:08:36 +03:00
unknown
66237f45fb Fix for a problem with :
CREATE / INSERT ... (SELECT ...) UNION (SELECT ...) LIMIT;
2003-07-02 14:57:40 +03:00
unknown
582d23a188 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


sql/sql_parse.cc:
  Auto merged
2003-07-02 10:57:03 +03:00
unknown
9f10eec5ba Fixed password check problem on windows (Bug #464) 2003-07-02 10:56:39 +03:00
unknown
24d93bedaa ha_innodb.cc:
Cleanup


sql/ha_innodb.cc:
  Cleanup
2003-07-02 02:01:11 +03:00
unknown
593c6d9a3a ha_innodb.cc:
Remove still some potential hangs over the btr0sea.c semaphore


sql/ha_innodb.cc:
  Remove still some potential hangs over the btr0sea.c semaphore
2003-07-02 01:57:40 +03:00
unknown
a2dfa95277 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
2003-07-02 01:25:34 +03:00
unknown
417c571bb3 Some fixes for CREATE / INSERT FROM UNIO >.. 2003-07-02 01:24:05 +03:00
unknown
65d7980556 merge changes
mysql-test/r/insert_select.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
2003-07-02 00:26:23 +03:00
unknown
12d879c912 Lot's of clean-ups and fixes for 4.0.14.
include/my_global.h:
  CONFIG_SMP
mysql-test/r/grant.result:
  Test cases for bug fixes
mysql-test/r/insert_select.result:
  Test cases for bug fixes
mysql-test/r/union.result:
  Test cases for bug fixes
mysql-test/t/grant.test:
  Test cases for bug fixes
mysql-test/t/insert_select.test:
  Test cases for bug fixes
mysql-test/t/union.test:
  Test cases for bug fixes
sql/sql_acl.cc:
  Fix for granting global privileges on db level
sql/sql_parse.cc:
  Fix for INSERT... SELECT
sql/sql_select.cc:
  removing a fix
sql/sql_union.cc:
  P
2003-07-02 00:10:47 +03:00
unknown
6806765a05 Merge heikki@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/heikki/mysql-4.0
2003-07-01 23:53:38 +03:00
unknown
2523049064 ha_innodb.cc:
Fix a possible hang over the btr0sea.c latch


sql/ha_innodb.cc:
  Fix a possible hang over the btr0sea.c latch
2003-07-01 23:52:59 +03:00
unknown
49938821c2 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-07-01 20:06:57 +02:00