Commit graph

2410 commits

Author SHA1 Message Date
unknown
e9635c95af Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-04-03 11:29:38 +03:00
unknown
584b4caa66 Safer stack checking 2003-04-03 11:29:10 +03:00
unknown
3258bb7248 Sprint task #856 : make table exclusion rules (in replication)
apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
GRANT and REVOKE will not be replicated on the slave.
2003-04-01 22:49:40 +02:00
unknown
5380411728 truncating REPLACE result bug fix
mysql-test/r/func_str.result:
  test result for truncating REPLACE result
mysql-test/t/func_str.test:
  test with long arguments for REPLACE
sql/item_strfunc.cc:
  fix for counting REPLACE result length
2003-03-30 18:36:01 +05:00
unknown
e61bbc45ec Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0


sql/mysqld.cc:
  Auto merged
2003-03-27 13:54:22 +02:00
unknown
2e6c3197a9 mysqld.cc:
Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction


sql/mysqld.cc:
  Make the default value of innodb_flush_log_at_trx_commit 1, not 0 which compromises the Durability of a transaction
2003-03-27 12:17:27 +02:00
unknown
f149c2776d fixed problem of port without host in SHOW PROCESSLIST (bug 189)
sql/sql_show.cc:
  fixed problem of port without host in SHOW PROCESSLIST
2003-03-26 22:04:20 +02:00
unknown
221dfec1a4 Fix for stack size checking on Solaris. 2003-03-26 14:51:22 +02:00
unknown
10b0edf399 Fix for glibc with small stack size (fixes bug when running crash-me)
sql-bench/limits/mysql.cfg:
  Update to new crash me
2003-03-26 14:11:17 +02:00
unknown
4291001df9 Fix for small bug #186 (If a connection has temporary tables and does
RESET MASTER, this breaks replication).
In the slave SQL thread, any DROP TEMPORARY TABLE is silently
converted to DROP TEMPORARY TABLE IF EXISTS, not to have irrelevant
"table does not exist". See comments in code or bug #186 for an example
of how irrelevant errors like this can arise.
2003-03-25 16:52:48 +01:00
unknown
044b0b2588 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged
2003-03-25 13:07:02 +02:00
unknown
829045100d Fixed bug with GROUP BY and alias
mysql-test/r/group_by.result:
  Test for group by + alias bug
mysql-test/t/group_by.test:
  Test for group by + alias bug
2003-03-25 13:06:20 +02:00
unknown
fd8972cfa7 Reverted fix away from 4.0, because it may in rare circumstanses
cause compatibility problems. Fix will be enabled in 4.1.
2003-03-23 11:30:45 +02:00
unknown
ebedd1521c Added error in case auto_increment and default where defined
at the same time.
2003-03-22 19:55:09 +02:00
unknown
3987075012 Fix for #178 Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
Now it does not SEGV, but USER() is still badly replicated
    (it is replicated to ""), which is a lower priority bug.


sql/item_strfunc.cc:
  Fix for #178  Replicating INSERT VALUES(USER()) crashes (SEGV) the slave
  Now it does not SEGV, but USER() is still badly replicated
  (it is replicated to ""), which is a lower priority bug.
2003-03-22 15:22:59 +01:00
unknown
6665ead9ba Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/work-qcfile-4.0


sql/sql_yacc.yy:
  Auto merged
2003-03-21 10:03:43 +02:00
unknown
5c21360390 Merge pmartin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/pem/work/mysql-4.0
2003-03-20 10:04:37 +01:00
unknown
7517a59a6d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-03-19 21:56:14 +02:00
unknown
0847c4f90e Print right hostname or IP in SHOW PROCESSLIST
Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists


Docs/internals.texi:
  Updated description for how DATE, TIME and TIMESTAMP are stored
mysql-test/r/create.result:
  New tests
mysql-test/t/create.test:
  New tests
sql/handler.cc:
  Use SESSION TABLE_HANDLER as default table handler if given table handler doesn't exists.
sql/sql_parse.cc:
  Fix that we return hostname instead of IP in SHOW PROCESSLIST
sql/sql_show.cc:
  Print right hostname or IP in SHOW PROCESSLIST
2003-03-19 21:43:41 +02:00
unknown
3b4dd0963d Fixed lots of typos, and translated a few messages. 2003-03-19 14:04:30 +01:00
unknown
b4a0cdb8de Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-03-19 13:40:24 +01:00
unknown
cd4d7716f8 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0


configure.in:
  Auto merged
2003-03-19 00:47:38 +02:00
unknown
f45236de39 Allow optimzation of multi-table-update also for InnoDB tables
MEMORY is alias for HEAP for CREATE TABLE ... TYPE=HEAP
Fixed bug in multi-table-update where a row could be updated several times


mysql-test/r/heap.result:
  Test of CREATE TABLE ... type=MEMORY
mysql-test/r/innodb.result:
  Added multi-update-test
mysql-test/r/multi_update.result:
  Added multi-update-test
mysql-test/t/heap.test:
  Test of CREATE TABLE ... type=MEMORY
mysql-test/t/innodb.test:
  Added multi-update-test
mysql-test/t/multi_update.test:
  Added multi-update-test
sql/ha_innodb.h:
  Allow optimzation of multi-table-update also for InnoDB tables
sql/handler.h:
  Allow optimzation of multi-update also for InnoDB tables
sql/key.cc:
  After merge fix
sql/lex.h:
  MEMORY is alias for HEAP
sql/sql_test.cc:
  Fixed wrong printf
sql/sql_update.cc:
  Fixed bug in multi-table-update where a row could be updated several times
sql/sql_yacc.yy:
  MEMORY is alias for HEAP
2003-03-19 00:45:44 +02:00
unknown
f04be0b9c5 - renamed "rnd" to "my_rnd" as the name was too generic (and is an exported
symbol in libmysqlclient) (thanks to Dennis Haney for the initial patch)
 - cleanup: removed client/password.c (not used at all) and
   libmysql/password.c (should rather be a symlink to sql/password.c instead)
 - applied HPUX11 portability fix for char_val declaration to sql/password.c
   (taken from libmysql/password.c)


BitKeeper/deleted/.del-password.c~c036d4f8b3280843:
  Delete: client/password.c
BitKeeper/deleted/.del-password.c~76f30876e68eddb4:
  Delete: libmysql/password.c
include/mysql_com.h:
   - replaced "rnd" with "my_rnd"
libmysql/Makefile.am:
   - removed dead piece of code ($qs was not defined)
   - symlink password.c from the sql directory
libmysqld/Makefile.am:
   - use password.c from the sql directory instead
sql/item_func.cc:
   - replaced "rnd" with "my_rnd"
sql/mysqld.cc:
   - replaced "rnd" with "my_rnd"
sql/password.c:
   - replaced "rnd" with "my_rnd"
sql/sql_class.cc:
   - replaced "rnd" with "my_rnd"
sql/sql_crypt.cc:
   - replaced "rnd" with "my_rnd"
2003-03-18 22:14:02 +01:00
unknown
21b0873a3c Merge with 3.23 to get fix for halloween problem on Update of InnoDB tables
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
sql/key.cc:
  Auto merged
configure.in:
  Merge with 3.23
mysql-test/r/innodb.result:
  Merge with 3.23
mysql-test/t/innodb.test:
  Merge with 3.23
strings/strto.c:
  Merge with 3.23
2003-03-18 03:19:20 +02:00
unknown
53bb7b6801 Test of range optimizer in InnoDB
sql/ha_myisam.cc:
  Added function comment
2003-03-18 03:16:12 +02:00
unknown
cf97cbd1db Fix of 'halloween bug' with UPDATE of InnoDB tables.
mysql-test/r/innodb.result:
  Test of 'halloween bug'
mysql-test/t/innodb.test:
  Test of 'halloween bug'
strings/strto.c:
  Portability fix
2003-03-18 02:51:16 +02:00
unknown
40c0b2c6c8 New variable rli->ignore_log_space_limit to resolve
a deadlock between I/O and SQL threads in replication
when relay_log_space is too small. This fixes bug #79.


sql/log.cc:
  New variable rli->ignore_log_space_limit to resolve
  a deadlock between I/O and SQL threads in replication
  when relay_log_space is too small.
sql/slave.cc:
  New variable rli->ignore_log_space_limit to resolve
  a deadlock between I/O and SQL threads in replication
  when relay_log_space is too small.
sql/slave.h:
  New variable rli->ignore_log_space_limit to resolve
  a deadlock between I/O and SQL threads in replication
  when relay_log_space is too small.
sql/sql_repl.cc:
  New variable rli->ignore_log_space_limit to resolve
  a deadlock between I/O and SQL threads in replication
  when relay_log_space is too small.
2003-03-17 22:51:56 +01:00
unknown
b1a78e2ae0 Change dbug.h -> my_dbug.h (Portability fix)
Ensure that \ is not allowed in filenames, even on Unix


include/my_dbug.h:
  Rename: include/dbug.h -> include/my_dbug.h
include/Makefile.am:
  Change dbug.h -> my_dbug.h
include/my_global.h:
  Change dbug.h -> my_dbug.h
libmysql/get_password.c:
  Change dbug.h -> my_dbug.h
libmysqld/lib_vio.c:
  Change dbug.h -> my_dbug.h
sql/table.cc:
  Ensure that \ is not allowed in filenames, even on Unix
2003-03-17 19:06:14 +02:00
unknown
9681f4a8cd Write binlog before commit when doing INSERT ... SELECT
mysql-test/r/create.result:
  After merge fix
sql/sql_insert.cc:
  Write binlog before commit
sql/sql_update.cc:
  Added comment
2003-03-16 16:28:30 +02:00
unknown
11117565a3 merge with 3.23 to get:
- Fix for empty table/column names


mysql-test/t/create.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/grant.pl:
  Auto merged
sql/filesort.cc:
  merge with 3.23
sql/sql_table.cc:
  merge with 3.23
tests/grant.res:
  merge with 3.23
2003-03-15 04:41:57 +02:00
unknown
13a5a24c61 Code cleanup
sql/sql_parse.cc:
  Removed not needed test
2003-03-15 04:34:06 +02:00
unknown
fcf035a0d8 Code cleanup 2003-03-14 23:06:55 +02:00
unknown
ccc4e2d1da Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-03-14 17:11:38 +02:00
unknown
03b0df9481 Check for empty table/column names
mysql-test/t/create.test:
  Test for empty table/column name
tests/grant.pl:
  More tests
tests/grant.res:
  More tests
2003-03-14 17:08:42 +02:00
unknown
11881c4289 ha_innobase.cc:
Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range


sql/ha_innobase.cc:
  Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range
2003-03-13 23:10:50 +02:00
unknown
f927267680 ha_innodb.cc:
Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range


sql/ha_innodb.cc:
  Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range
2003-03-13 23:09:25 +02:00
unknown
ead5a5deab Merge
sql/filesort.cc:
  SCCS merged
2003-03-13 18:51:50 +01:00
unknown
ae01a3533b fix for crash with small sort_buffer 2003-03-13 18:46:40 +01:00
unknown
d2d9910133 merged
sql/sql_base.cc:
  Auto merged
tests/grant.res:
  Auto merged
2003-03-13 17:57:24 +01:00
unknown
f3eb7fe0c3 Better fix for GRANT bug
tests/grant.pl:
  More options for test
tests/grant.res:
  new test results
2003-03-13 16:43:43 +02:00
unknown
ace956f490 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-13 14:47:58 +01:00
unknown
eec2f8ba2f - fixed newly added DBUG_RETURN to DBUG_VOID_RETURN (compile failed with
"DBUG_RETURN undeclared" on Mac OS X)
2003-03-13 13:52:15 +01:00
unknown
50da5c1858 merged
man/perror.1:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
mysql-test/r/analyse.result:
  ul
mysql-test/r/group_by.result:
  ul
mysql-test/r/select.result:
  ul
2003-03-13 13:44:03 +01:00
unknown
d367d5ddb8 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0


sql/mysqld.cc:
  Auto merged
2003-03-13 11:23:34 +01:00
unknown
c7551b8840 Merge bk-internal:/home/bk/mysql-3.23/
into serg.mysql.com:/usr/home/serg/Abk/mysql
2003-03-13 10:53:58 +01:00
unknown
8fa237edd3 better help message 2003-03-13 01:23:43 +01:00
unknown
b12b64a0c3 added comment 2003-03-12 22:50:22 +02:00
unknown
8209eb579e ha_myisam.cc:
typo fixed


sql/ha_myisam.cc:
  typo fixed
2003-03-12 18:32:27 +01:00
unknown
32208e0255 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-3.23
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-12 17:23:23 +02:00