Commit graph

8009 commits

Author SHA1 Message Date
unknown
1a22b760b3 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0
2004-07-07 16:33:30 -05:00
unknown
9c8965933b Merge here.mwagner.org:/Volumes/BK/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
2004-07-07 16:29:10 -05:00
unknown
fc3c71e9b6 my_md5sum:
Exit properly


Build-tools/my_md5sum:
  Exit properly
2004-07-07 16:28:07 -05:00
unknown
2a64371e64 my_lib.c:
more accurate comment


mysys/my_lib.c:
  more accurate comment
2004-07-05 19:12:23 +02:00
unknown
bdb3460fed Windows-specific:
Fix for BUG#4375 "Windows specific directories are copied during
replication": in the Windows version of my_dir(), do not show hidden
or system files which Windows sometimes creates in the root directory
of drive (like RECYCLER and SYSTEM VOLUME INFORMATION directories) (so
this problem showed up only when the datadir was the root dir of a
drive).
This will make SHOW DATABASES display better, and will do no harm to
MySQL. For example, DROP DATABASE will not miss some files, as MySQL
creates no hidden or system files.


mysys/my_lib.c:
  In my_dir(), do not show hidden or system files
  which Windows sometimes creates.
2004-07-05 19:07:26 +02:00
unknown
b30cd30a66 Fixing a bug in mysqltest.c:
if a command has a comment at the end of line, like:
error 2002 ; # this is error 2002
then the parsing of comment should not make mysqltest
forget about the value of expected error.
Reason it forgot it (so the next query caused the test to fail)
is that internally the above line is 2 queries.



client/mysqltest.c:
  if a command has a comment at the end of line, like:
  error 2002 ; # this is error 2002
  then the parsing of comment should not make mysqltest
  forget about the value of expected error.
2004-07-02 19:20:30 +02:00
unknown
6f45a5f18a Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0
2004-07-01 14:55:23 -05:00
unknown
aae8874dd1 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2004-06-30 16:16:57 +02:00
unknown
62a6733e4e Fix for BUG#4326 "Replicated LOAD DATA INFILE show nothing in
processlist on slave":
we now report in SHOW PROCESSLIST that we are writing to the temp
files or loading the table. When we are writing to the tmp file:
| 3  | system user |                 |    | Connect | 6    | Making temp file /tmp/SQL_LOAD-2-1-2.data | 
and when we are actually loading the .data temp file into the table:
| 3  | system user |                 | test | Connect | 2    | | LOAD DATA INFILE '/tmp/SQL_LOAD-2-1-2.data' INTO TABLE `t` <...> |


sql/log_event.cc:
  Replication of LOAD DATA INFILE:
  we now report in SHOW PROCESSLIST that we are creating
  the temp files or loading the table.
  Plus removing a line which had a comment "should not be needed"
  and a guarding assertion which we have never heard fail (and logic
  says it should not fail).
2004-06-30 15:41:35 +02:00
unknown
7b6712a061 my_md5sum:
Added code to use locally installed perl modules first


Build-tools/my_md5sum:
  Added code to use locally installed perl modules first
2004-06-29 02:13:24 -05:00
unknown
cf8a6e52b7 s/\r\n/\n/ in mysql-test/*/system_mysql_db*
according to http://www.bitkeeper.com/Documentation.FAQS.Windows_NT.html


mysql-test/t/system_mysql_db.test:
  s/\r\n/\n/
mysql-test/t/system_mysql_db_fix-master.opt:
  s/\r\n/\n/
mysql-test/t/system_mysql_db_fix.test:
  s/\r\n/\n/
mysql-test/t/system_mysql_db_refs.test:
  s/\r\n/\n/
mysql-test/r/system_mysql_db.result:
  s/\r\n/\n/
mysql-test/r/system_mysql_db_refs.result:
  s/\r\n/\n/
2004-06-28 15:53:49 +05:00
unknown
d72f90dbe0 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-06-27 18:21:14 +03:00
unknown
3eb5fd0f24 Fix to be able to cross-compile for modesto
scripts/make_win_src_distribution.sh:
  Change mode to -rw-rw-r--
2004-06-27 18:20:06 +03:00
unknown
07589a6da5 Merge mysql.com:/home/my/mysql-3.23 into mysql.com:/home/my/mysql-4.0
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2004-06-25 18:55:03 +03:00
unknown
72093a6d14 Add missing .cnf files to windows installation (Bug #4216)
scripts/make_win_binary_distribution.sh:
  Add missing .cnf files (Bug #4216)
scripts/make_win_src_distribution.sh:
  Add missing .cnf files (Bug #4216)
  Align code with MySQL 4.1
2004-06-25 18:54:43 +03:00
unknown
3c7745ffcd Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-lock
2004-06-25 16:45:50 +02:00
unknown
f1257b3f91 Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug2686
2004-06-25 14:44:37 +02:00
unknown
fb987c8907 Merge
sql/ha_berkeley.cc:
  Auto merged
mysql-test/r/bdb.result:
  SCCS merged
mysql-test/t/bdb.test:
  SCCS merged
2004-06-25 12:59:47 +02:00
unknown
0f42f82d2d Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug3565


sql/sql_table.cc:
  Auto merged
2004-06-25 12:14:54 +02:00
unknown
83bee61eb8 Prevent potential problems on 32-Bit machines. 2004-06-25 11:35:37 +02:00
unknown
d75022fff7 parameter of my_yyoverflow made independed from YYSIZE_T (BUG#4204)
sql/sql_parse.cc:
  parameter of my_yyoverflow made independed from YYSIZE_T
sql/sql_yacc.yy:
  parameter of my_yyoverflow made independed from YYSIZE_T
2004-06-24 22:15:15 +03:00
unknown
bd71177369 Merge here.mwagner.org:/Volumes/BK/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
2004-06-24 12:23:28 -05:00
unknown
df22d47135 logger.pm, Bootstrap:
Updates for output enhanced Bootstrap


Build-tools/Bootstrap:
  Updates for output enhanced Bootstrap
Build-tools/logger.pm:
  Updates for output enhanced Bootstrap
2004-06-24 12:22:48 -05:00
unknown
8f6664c59a bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
Redesigned the handler close functions so that they are usable
at different places where waiting for closing tables is done.


mysql-test/r/flush_table.result:
  bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
  Added the test results.
mysql-test/t/flush_table.test:
  bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
  Activated old test case.
  Added new test cases.
sql/mysql_priv.h:
  bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
  Made mysql_ha_close() more flexible.
  Removed mysql_ha_closeall(), which closed only one table despite its name.
  Added mysql_ha_close_list(), which closes the complete list or all tables and does not lock.
  Removed a duplicate declaration.
sql/sql_base.cc:
  bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
  Added proper close calls before some wait points to avoid deadlocks
  or infinite loops.
sql/sql_handler.cc:
  bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
  Redesigned the internal function find_table_ptr_by_name().
  It can now suppress locking and tells if the requested table
  has been flushed by itself.
  Extended mysql_ha_close() so that it can now suppres locking
  and error reporting. That way it can be used at more places and the
  old function mysql_ha_closeall() is now obsolete.
  Added a new function mysql_ha_close_list() which closes a whole list
  of HANDLER tables or all HANDLER tables, if the list is NULL.
  Furthermore is can close all 'old' (marked for flush) HANDLER tables.
sql/sql_table.cc:
  bug#3565 - HANDLER and FLUSH TABLE/TABLES deadlock.
  Replaced the obsolte mysql_ha_closeall() by the new mysql_ha_close().
2004-06-24 15:06:56 +02:00
unknown
afe29967e0 bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
Added put_length() to get_length() and unpack_key() to pack_key().
Keys were packed with the minimum size of the length field for the key part and 
unpacked with length size of the base column. 
For the purpose of optimal key packing we have the method pack_key(), while rows are 
packed with pack(). Now keys are unpacked with unpack_key() and no longer with 
unpack() which is used for rows.


mysql-test/r/bdb.result:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Added the test case results.
mysql-test/t/bdb.test:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Added the test case.
sql/field.cc:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Added put_length() to get_length() and unpack_key() to pack_key().
  Keys were packed with the minimum size of the length field for the key part and 
  unpacked with length size of the base column. 
  For the purpose of optimal key packing we have the method pack_key(), while rows are packed 
  with pack(). Now keys are unpacked with unpack_key() and no longer with unpack() which is 
  used for rows.
sql/field.h:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Added put_length() to get_length() and unpack_key() to pack_key().
  The default implementation simply calls unpack() for those field types that don't need 
  a special key unpacking.
sql/ha_berkeley.cc:
  bug#2686 - index_merge select on BerkeleyDB table with varchar PK causes mysqld to crash.
  Now keys are unpacked with unpack_key() and no longer with unpack() which is used for rows.
  For most field types, however, this simply calls unpack().
2004-06-24 14:54:28 +02:00
unknown
098a1e3afa Merge mysql.com:/home/mydev/mysql-4.0
into mysql.com:/home/mydev/mysql-4.0-bug2688
2004-06-24 12:07:00 +02:00
unknown
b24c837ecd Development.fgl:
add typelib.h to filelist
Clients and Tools.fgl:
  add libmysql.dll to file list
4.0.XX-gpl.ipr:
  Various fixes to installshield project file (added files)


VC++Files/InstallShield/4.0.XX-gpl/4.0.XX-gpl.ipr:
  Various fixes to installshield project file (added files)
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Clients and Tools.fgl:
  add libmysql.dll to file list
VC++Files/InstallShield/4.0.XX-gpl/File Groups/Development.fgl:
  add typelib.h to filelist
2004-06-23 21:02:37 -07:00
unknown
e31f042f84 Do-rpm:
Small fix to handle the src rpm file correctly (contains '0', release number in spec file)


Build-tools/Do-rpm:
  Small fix to handle the src rpm file correctly (contains '0', release number in spec file)
2004-06-23 20:26:20 -07:00
unknown
429f9d05a2 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/my/mysql-4.0
2004-06-23 16:44:54 +03:00
unknown
3db93f8086 lower_case_table_names=2 (Keep case for table names) was not honored
with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
Make net_buffer_length visible for mysql clients (Bug #4206)


include/mysql.h:
  Make net_buffer_length visible for mysql clients
libmysql/libmysql.c:
  Make net_buffer_length visible for mysql clients
mysql-test/mysql-test-run.sh:
  Don't give warning for some common 'safe' warnings
mysql-test/r/lowercase_table2.result:
  Test name conversion with ALTER TABLE / CREATE INDEX (Bug #3109)
mysql-test/t/lowercase_table2.test:
  Test name conversion with ALTER TABLE / CREATE INDEX (Bug #3109)
scripts/mysql_install_db.sh:
  Removed not used variable
sql/sql_table.cc:
  lower_case_table_names=2 (Keep case for table names) was not honored
  with ALTER TABLE and CREATE/DROP INDEX. (Bug #3109)
2004-06-23 16:44:34 +03:00
unknown
a2c506702e Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-06-23 12:17:50 +03:00
unknown
9a9c59db83 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0
2004-06-22 13:03:20 -05:00
unknown
5b2e07b1c8 Merge here.mwagner.org:/Volumes/BK/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work
2004-06-22 12:58:47 -05:00
unknown
05d7867d57 my_md5sum:
Change behaviour to be like the md5sum in GNU coreutils


Build-tools/my_md5sum:
  Change behaviour to be like the md5sum in GNU coreutils
2004-06-22 12:57:52 -05:00
unknown
1c1dcdd152 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2004-06-22 17:55:57 +02:00
unknown
1f9209cc04 - rephrased comment 2004-06-22 17:54:38 +02:00
unknown
e2e0eb3bc0 - Applied some portability fixes for SGI IRIX/MipsPro compiler
(e.g. a fix for BUG#3507 and some modifications recommended
   by Andrea Suatoni and Joerg Behrens - thank you!)


acinclude.m4:
   - OpenSSL libs are installed in /usr/freeware/include and
     /usr/freeware/lib32 on SGI IRIX - expanded search list
man/mysqlaccess.1.in:
   - cosmetical fix
man/mysqldump.1.in:
   - cosmetical fix
mysys/hash.c:
   - portability fix: some compilers can't handle inlining of rec_hashnr
     (BUG#3507)
vio/test-sslserver.c:
   - portability fix for SGI MipsPro compiler: define client_len as
     "socklen_t" instead of "size_t"
2004-06-22 17:35:34 +02:00
unknown
8f3b8de272 bug#2688 - Wrong index_merge query results for BDB table with variable length primary key.
dded code to clear the tail of the reference buffer if the actual key length 
is less than the maximum key length.


mysql-test/r/bdb.result:
  bug#2688 - Wrong index_merge query results for BDB table with variable length primary key.
  Added the test case results.
mysql-test/t/bdb.test:
  bug#2688 - Wrong index_merge query results for BDB table with variable length primary key.
  Added the test case.
sql/ha_berkeley.cc:
  bug#2688 - Wrong index_merge query results for BDB table with variable length primary key.
  Added code to clear the tail of the reference buffer if the actual key length 
  is less than the maximum key length.
2004-06-22 17:27:57 +02:00
unknown
a331664dab lexyy.c, pars0lex.l:
Document the handling of quoted strings


innobase/pars/pars0lex.l:
  Document the handling of quoted strings
innobase/pars/lexyy.c:
  Document the handling of quoted strings
2004-06-22 16:15:58 +03:00
unknown
81221dcbdc Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-06-22 16:14:21 +03:00
unknown
4d39221a0f 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-06-22 13:22:00 +03:00
unknown
073de02c13 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0


mysql-test/r/range.result:
  Auto merged
2004-06-21 19:44:20 +03:00
unknown
83a4e46d8e use ref not range for ... WHERE key IN (val) 2004-06-21 19:42:00 +03:00
unknown
a6204676ee Merge marko@build.mysql.com:/home/bk/mysql-4.0
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2004-06-21 11:06:45 +03:00
unknown
306942c94c do not clear list of changed tables on one statement rollback (Bug #4213)
mysql-test/r/innodb_cache.result:
  test of rollback one statement in transaction
mysql-test/t/innodb_cache.test:
  test of rollback one statement in transaction
sql/handler.cc:
  clear changed tables list only for total roll back
2004-06-20 23:44:21 +03:00
unknown
94df4f36dd mem0dbg.c:
InnoDB with UNIV_MEM_DEBUG did not compile because a global variable was forgotten when we put back mem_print_info() functions 2 days ago; add that variable


innobase/mem/mem0dbg.c:
  InnoDB with UNIV_MEM_DEBUG did not compile because a global variable was forgotten when we put back mem_print_info() functions 2 days ago; add that variable
2004-06-19 12:12:00 +03:00
unknown
c02eb02cd4 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into here.mwagner.org:/Volumes/BK/mysql-4.0-work


BitKeeper/etc/logging_ok:
  auto-union
2004-06-18 15:00:17 -05:00
unknown
00ad281dae my_md5sum:
new file, simulates 'md5sum' as a perl script


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-06-18 14:57:42 -05:00
unknown
eac5455aa4 mach0data.ic, mach0data.h:
Improve documentation of mach_*write_*compressed()
mtr0log.ic, mtr0log.h:
  Improve documentation of mlog_write_initial_log_record_fast()


innobase/include/mtr0log.h:
  Improve documentation of mlog_write_initial_log_record_fast()
innobase/include/mtr0log.ic:
  Improve documentation of mlog_write_initial_log_record_fast()
innobase/include/mach0data.h:
  Improve documentation of mach_*write_*compressed()
innobase/include/mach0data.ic:
  Improve documentation of mach_*write_*compressed()
2004-06-18 15:54:19 +03:00
unknown
20985f3e90 Merge miguel@bk-internal.mysql.com:/home/bk/mysql-4.0
into hegel.txg:/home/miguel/bk/mysql-4.0
2004-06-18 01:43:25 -03:00