Commit graph

6145 commits

Author SHA1 Message Date
unknown
8f739cd674 Do not silently do RESET MASTER when one does 'mysqldump --master-data' ;
only do it if the user specifies --delete-master-logs (new option).
Safer + fixes bug #159.


client/client_priv.h:
  New option --delete-master-logs for mysqldump
client/mysqldump.c:
  New option --delete-master-logs for mysqldump
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-19 15:16:51 +01: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
71aa1f6d56 - updated version number (4.0.12 -> 4.0.13)
- tagged ChangeSet 1.1671 as mysql-4.0.12


configure.in:
   - updated version number (4.0.12 -> 4.0.13)
2003-03-18 10:00:29 +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
2103479670 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-03-17 19:07:08 +02: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
440cb76f8e Fixed a bug in --one-database. 2003-03-17 15:50:56 +02:00
unknown
bfbb0ad69d Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-03-16 16:30:54 +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
d5292ebfb6 Merge bk-internal.mysql.com:/home/bk/mysql-3.23
into mashka.mysql.fi:/home/my/mysql-3.23
2003-03-16 16:26:59 +02:00
unknown
11fdb2d387 row0mysql.c:
Test if merging from 3.23 to 4.0 succeeds


innobase/row/row0mysql.c:
  Test if merging from 3.23 to 4.0 succeeds
2003-03-16 14:40:41 +02:00
unknown
f08688c5ee trx0roll.c:
Fix compiler warning in Windows about ib_longlong to ulint conversion


innobase/trx/trx0roll.c:
  Fix compiler warning in Windows about ib_longlong to ulint conversion
2003-03-16 09:01:47 +02:00
unknown
3ad8b4c19c row0sel.c:
Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal


innobase/row/row0sel.c:
  Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal
2003-03-15 20:05:55 +02:00
unknown
3ce965da7a row0sel.c:
Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal


innobase/row/row0sel.c:
  Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal
2003-03-15 20:05:03 +02:00
unknown
41bad531ea - fixed C++-style comments to make IBM C compiler happy
client/mysqlshow.c:
   - fixed C++-style comment to make IBM C compiler happy
2003-03-15 18:42:55 +01:00
unknown
d8ea9fc972 - tagged ChangeSet 1.1358 as mysql-3.23.56
- bumped up version number to 3.23.57 in configure.in
2003-03-15 12:35:09 +01: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
3d3e42547f Merge build:/home/bk/mysql-4.0
into mysql.com:/Users/mysqldev/my/mysql-4.0
2003-03-14 20:08:13 +01: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
251a616f31 Small fixes in mysql_tableinfo. It's only code tiny changes, does not modify
the output of the script.


scripts/mysql_tableinfo.sh:
  Small fixes in this program which I contributed some time ago. These fixes
  are waiting in Monty's mailbox since August, and there are tiny :
  * use array{'x'} instead of array{x}
  * use fetchrow_arrayref instead of fetchrow_array
  * try to hide the command-line options from 'ps' like mysqlhotcopy does
  * use 'map' instead of homegrown function
  * use $_ instead of $i when possible
2003-03-14 16:07:15 +01:00
unknown
6d47e03f56 - we need to require an installation on the root volume (/usr/local/mysql) 2003-03-14 14:17:56 +01: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
5a667a50a8 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-13 19:00:49 +01: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
aca9fe2dfa Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-03-13 18:17:58 +01:00
unknown
2b051ccb81 - added option "--skip-disk-image" and short form "-s" in addition to the
already existing "--skip-dmg" (per Monty request)
 - Fixed handling of license files
2003-03-13 18:16:47 +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
e97a000a65 make test result more obvious 2003-03-13 14:40:13 +01:00
unknown
012c8f9175 test result updated after merge 2003-03-13 14:34:07 +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
a4aaac02f3 texinfo syntax cleanup. 4.1 protocol sections are still too broken for this file to be compiled :( 2003-03-13 12:20:29 +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
3dfcd944fe Added PeterG's new internals documenation.
Docs/internals.texi:
  Added PeterG's new internals documentation.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-03-12 21:35:57 -08:00
unknown
606a23f551 VC++ InstallShield Setup Programs for 4.0.XX tree 2003-03-12 23:16:36 -04:00