Commit graph

6796 commits

Author SHA1 Message Date
unknown
64393d7e24 Move test that uses many tables (in query_cache.test) to separate test so that we can get it 'skipped' instead of 'failed' on system where we can't open many files.
client/mysqltest.c:
  Fix that LET can be used with queries that return multiple columns
libmysql/errmsg.c:
  Extend socket name to 100 characters in error messages
libmysql/libmysql.c:
  Reset some variables to make ensure that we can call mysql_server_init()/mysql_server_end() many times
mysql-test/mysql-test-run.sh:
  Set open-files-limit to 1024
mysql-test/r/loaddata.result:
  Add test case for LOAD DATA bug report (was not a bug)
mysql-test/r/query_cache.result:
  Move test with many tables to separate test
mysql-test/r/select_safe.result:
  Make test repeatable
mysql-test/t/loaddata.test:
  Add test case for LOAD DATA bug report (was not a bug)
mysql-test/t/query_cache.test:
  Move test with many tables to separate test
mysql-test/t/select_safe.test:
  Make test repeatable
sql/field.cc:
  Portability fix for gcc 3.3
sql/mysqld.cc:
  Store in open_files_limit the true number of files we can open (if system supports it)
sql/sql_load.cc:
  Safety fix
2003-08-22 04:07:40 +03:00
unknown
7b9018920b Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1086
2003-08-20 18:16:08 +04:00
unknown
83374580c2 Fixed problem with undefined assert symbol 2003-08-20 17:16:07 +03:00
unknown
924a9708c9 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/dlenev/src/mysql-4.0-bg-1086
2003-08-20 17:25:45 +04:00
unknown
de5d47c35d Fixed some varnings from valgrind
Set min value of max_allowed_packet to 1024
Fixed problem with UNION's without braces and SQL_CALC_FOUND_ROWS, LIMIT #,#
and ORDER BY...LIMIT


include/m_string.h:
  Added memcpy_overlap() to avoid warnings when using valgrind on memcpy(A,A,...)
myisam/mi_create.c:
  Fixed comment
myisam/mi_search.c:
  Fix warning from valgrind
myisam/mi_write.c:
  Indentation fix
mysql-test/mysql-test-run.sh:
  Add options handled by general skip- option
mysql-test/r/packet.result:
  Update results after change to mysqld (min max_allowed_packet length is now 1024)
mysql-test/r/union.result:
  Added testing of UNION with SQL_CALC_FOUND_ROWS
mysql-test/t/packet.test:
  Update results after change to mysqld (min max_allowed_packet length is now 1024)
mysql-test/t/union.test:
  Added testing of UNION with SQL_CALC_FOUND_ROWS
sql/field.cc:
  Fix to remove waarning from valgrind
sql/ha_innodb.cc:
  Remove wrong include file
sql/item_cmpfunc.cc:
  Safety fix to handle EOM conditions in IN
sql/item_sum.cc:
  Fixed prototype for update_field() (argument was alwys 0)
sql/item_sum.h:
  Fixed prototype for update_field() (argument was alwys 0)
sql/item_uniq.h:
  Fixed prototype for update_field() (argument was alwys 0)
sql/log.cc:
  Indentation fix
sql/mysqld.cc:
  Set min value of max_allowed_packet to 1024 (to avoid it getting set to 0)
sql/net_serv.cc:
  Indentation changes + trivial optimization
sql/sql_select.cc:
  Fixed prototype for update_field() (argument was alwys 0)
sql/sql_union.cc:
  Fixed problem with UNION's without braces and
  - SQL_CALC_FOUND_ROWS
  - LIMIT #,#
  - ORDER BY ... LIMIT
2003-08-20 16:25:44 +03:00
unknown
e3541b8a97 Fix for BUG#1086. Now we don't preserve event's log_pos through
log-slave-updates since this causes unexpected values in 
Exec_master_log_pos in A->B->C replication setup, synchronization
 problems in master_pos_wait()... 
Still this brokes some functionality in sql/repl_failsafe.cc 
(but this file is not used now)


mysql-test/r/rpl_log.result:
  SHOW BINLOG EVENTS for binlog on slave should give the same 
  Orig_log_pos and Pos values
sql/log_event.cc:
  Do not propagate our master's log pos to our bin log
sql/repl_failsafe.cc:
  Added comment about broken SHOW NEW MASTER
sql/slave.cc:
  Do not propagate our master's log pos to our bin log
sql/sql_class.cc:
  THD::log_pos is no longer needed
sql/sql_class.h:
  THD::log_pos is no longer needed
sql/sql_parse.cc:
  Added comment about broken SHOW NEW MASTER
2003-08-20 03:38:31 +04:00
unknown
9c5c6dafa1 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-19 20:58:16 +02:00
unknown
018e7524b8 FT-NL bugfix - ignore words that appear more than in 2mio rows to avoid tree overflow.
optimization: abort search for common (>50% rows) words earlier.
2003-08-19 20:53:45 +02:00
unknown
67301c606c Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.0-build
2003-08-19 18:35:31 +02:00
unknown
be9744817c - Added a missing directory variable definition to the Bootstrap script.
Build-tools/Bootstrap:
   - defined $opt_directory to be the present working directory. No clue how
     this worked before...
2003-08-19 18:34:44 +02:00
unknown
d43a347db1 Use my_b_append instead of my_b_write on a SEQ_READ_APPEND cache, when we write
the first 4 bytes of the relay log. Indeed comments in mysys/mf_iocache.c 
say we must always use my_b_append for such a cache.
This *could* avoid a very rare assertion failure which is: 
030524 19:32:38  Slave SQL thread initialized, starting replication in log 'FIRST' at position 0, relay log '/
users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000001' position: 4
030524 19:32:38  next log '/users/gbichot/4.1.1/mysql-test/var/log/slave-relay-bin.000002' is currently active
mysqld: mf_iocache.c:701: _my_b_seq_read: Assertion `pos_in_file == info->end_of_file' failed.
and which seemed to happen always when the SQL thread and/or the I/O thread
were at position 4 in a relay log.


include/my_sys.h:
  moving a function from log_event.cc so that it can be widely used
mysys/mf_iocache.c:
  moving a function from log_event.cc so that it can be widely used
sql/log.cc:
  my_b_write should not be used on a SEQ_READ_APPEND cache, one should use my_b_append
  (otherwise there could be some locking problems).
sql/log_event.cc:
  moved to mysys/mf_iocache.c for wider use.
  A typo.
2003-08-19 17:00:36 +02:00
unknown
fe0e546434 Fix for BUG#1096 which is:
"mysqlbinlog does not comment the original LOAD DATA INFILE if it has a "use xx""


client/mysqlbinlog.cc:
  a comment
sql/log_event.cc:
  in mysqlbinlog we want to have a leading '#' before LOAD DATA INFILE when we
  print a Create_file event.
  This was not done properly when the query had *2* lines: only the "use db" got
  commented.
  To fix this I had to add an argument to Load_log_event::print, it could not be
  handled in Create_file_log_event::print alone.
sql/log_event.h:
  prototype
2003-08-19 15:46:47 +02:00
unknown
4392456bea Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-19 15:22:36 +02:00
unknown
245da39360 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-19 16:17:54 +03:00
unknown
c7578701e3 Fixes for BUG#1091,1092,1093. Synopsis of these bugs:
mysqlbinlog segfaults if --position is just before Exec_load event
mysqlbinlog prints uncommented warnings if --database and compiled with debug
mysqlbinlog --database does not filter LOAD DATA INFILE


client/mysqlbinlog.cc:
  * Don't stop in Append_block when there is no Create_file. Just print a warning.
  * Test LOAD DATA (Create_file) against --database.
  * Don't print "no skip" when you don't skip an event when using --database (it
  causes syntax errors in 'mysql').
  * Print a warning in Exec_load if there is no Create_file.
2003-08-19 15:12:44 +02:00
unknown
de9a0cbe2f Fix test case 2003-08-19 16:03:18 +03:00
unknown
a8aaa3ef46 - Do-pkg can now create a separate package including a MySQL Startup Item
for Mac OS X and add it to the installation Disk Image.


Build-tools/Do-pkg:
   - added code to build the StartupItem PKG along with the MySQL PKG and
     add it to the resulting Disk Image (can be skipped with --skip-si)
   - lots of cleanups (use more builtin Perl functions instead of 
     subprocesses, enable a full dry run without errors)
support-files/MacOSX/StartupItem.Info.plist:
   - removed IFPkgFlagOverwritePermissions and IFPkgFlagUseUserMask
2003-08-19 13:57:58 +02:00
unknown
9194f5ef33 - Optimized and cleaned up the Do-rpm and Bootstrap Perl scripts
- Enhanced Do-rpm to support building RPMs with different compilers
   and options


Build-tools/Bootstrap:
   - small optimization (use builtin Perl cwd() function instead of running
     "pwd" twice)
Build-tools/Do-rpm:
   - added options to handle different compilers and compile flags (e.g. when
     compiling on IA64 using the Intel ecc compiler)
   - code cleanups (use more builtin Perl functions instead of forking
     subrocesses)
   - don't try to probe various distribution-specific RPM options - query rpm
     directly instead
   - Pass the MySQL version as an argument, not an option (as it's not
     optional anyway)
2003-08-19 13:49:53 +02:00
unknown
01441bc590 Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-08-18 01:56:31 +03:00
unknown
79e3476071 fixed typo in last push 2003-08-17 14:37:26 +03:00
unknown
ff012aedab 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-08-17 14:10:45 +03:00
unknown
0eaf4d8d7e Fix mutex handling in SHOW_VARIABLES (key_buffer_size was not properly protected)
Changed some non fatal myisamchk error messages to warnings


myisam/myisamchk.c:
  Change error -> warning
sql/handler.cc:
  Add mutex around keybuff_size usage
sql/mysql_priv.h:
  Indentation update
sql/set_var.cc:
  Add mutex around longlong variable usage
sql/sql_parse.cc:
  Fix mutex handling in SHOW_VARIABLES
sql/sql_show.cc:
  Fix mutex handling in SHOW_VARIABLES
2003-08-17 14:10:15 +03:00
unknown
5ef233aa39 Fixed a limitation bug in mysqlimport. sql_statement was designed to
contain max 1280 characters, but sometimes in rare cases when --columns
was used, more than 1280 characters was needed. This is case when a lot
of columns was specified using this option. Raised the max value to 8448,
which should be enough.
2003-08-16 17:03:48 +03:00
unknown
4363c28c24 - Added some files to support-files/MacOSX to enable building the Mac OS X
startup item: MySQL (the startup script), StartupItem.Description.plist,
   StartupItem.Info.plist (PKGMaker control files), StartupItem.postinstall
   (post-installation script for the Startup Item package)
 - modified support-files/MacOSX/Makefile.am to include the newly added files
   in the source distribution


BitKeeper/etc/ignore:
  Added scripts/make_win_src_distribution to the ignore list
support-files/MacOSX/Makefile.am:
  - added the Mac OS X StartupItem files to the source distribution
2003-08-15 14:55:05 +02:00
unknown
02d844ee8c Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-15 10:17:27 +03:00
unknown
ccd828900b Cleanups to recent patches
Fix packet error when using wrong GRANT command


include/config-win.h:
  Changed back to test for HAVE_SETFILEPOINTER instead of operating system
mysql-test/r/grant.result:
  Extra test to catch wrong packet bug
mysql-test/t/grant.test:
  Extra test to catch wrong packet bug
mysys/my_chsize.c:
  Cleanup
sql/opt_range.cc:
  Fix to recent BETWEEN patch
sql/sql_acl.cc:
  Fix packet error when using wrong GRANT command
sql/sql_select.cc:
  Cleanups
  Added not critical out-of-memory check
2003-08-15 09:54:19 +03:00
unknown
902111963e Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.0
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
2003-08-15 00:17:43 +03:00
unknown
9ac61d15fa make_win_src_distribution.sh:
Add --zip option for finer grain control over what package formats are created
Bootstrap:
  Create both Windows source packages


Build-tools/Bootstrap:
  Create both Windows source packages
scripts/make_win_src_distribution.sh:
  Add --zip option for finer grain control over what package formats are created
2003-08-13 19:32:34 +02:00
unknown
e4e8a2f3cc make_win_src_distribution.sh:
'tools' contains intermediate files


scripts/make_win_src_distribution.sh:
  'tools' contains intermediate files
2003-08-13 17:00:22 +02:00
unknown
88977ce1dc make_win_src_distribution.sh:
Adding *.txt here didn't work well-- infolist.txt is in a path containing spaces


scripts/make_win_src_distribution.sh:
  Adding *.txt here didn't work well-- infolist.txt is in a path containing spaces
2003-08-13 16:45:28 +02:00
unknown
78b59b190e make_win_src_distribution.sh:
Clean up script, add needed modifications to generate a complete 4.0 Windows source package


scripts/make_win_src_distribution.sh:
  Clean up script, add needed modifications to generate a complete 4.0 Windows source package
2003-08-13 16:36:01 +02:00
unknown
8cc3906e2d Merge build.mysql.com:/home/bk/mysql-4.0
into build.mysql.com:/users/gweir/mysql-4.0
2003-08-13 16:35:06 +02:00
unknown
5c9e0cdc53 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0


sql/sql_select.cc:
  Auto merged
2003-08-13 13:26:52 +03:00
unknown
06451ae437 - we are already in $target_dir, no need to prepend it to the build
command.
2003-08-13 07:24:35 +02:00
unknown
c32ebf3a86 Fixed typo in the Boostrap strip
Build-tools/Bootstrap:
   - fixed typo
2003-08-13 07:12:08 +02:00
unknown
791581016c make_win_src_distribution.sh:
Copy some previously missed files


scripts/make_win_src_distribution.sh:
  Copy some previously missed files
2003-08-13 04:52:03 +02:00
unknown
7d6f474777 Bootstrap:
Corrections to Bootstrap for --win-dist



Build-tools/Bootstrap:
  Corrections to for --win-dist
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-08-13 02:13:45 +02:00
unknown
5def098850 Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
2003-08-12 23:28:23 +02:00
unknown
8712fee26e nothing interesting 2003-08-13 03:22:34 +06:00
unknown
965050afc9 - enabled embedded server in the binary distributions by default
(Do-compile)
 - added mysql.info to the binary distribution files (BUG#1019)
 - heavily reworked the Do-rpm script to be more in line with Do-pkg
 - create a "docs" subdirectory in the binary distribution and moved the
   manual, ChangeLog and mysql.info file into it to unclutter the top
   directory


Build-tools/Do-compile:
   - enable compiling with the embedded server by default (as requested by
     BrianA) - disable it with the "--disable-embedded" compile option.
Build-tools/Do-rpm:
   - replaced the original Shell script with a Perl script, similar to Do-pkg.
     Some more work remains to be done (copying the resulting packages,
     enable using different compile flags and compilers).
scripts/make_binary_distribution.sh:
   - move some docs into a subdirectory "docs" to not clutter the top 
     directory with too many files.
   - added mysql.info info file to the docs dir (BUG#1019)
2003-08-12 23:21:21 +02:00
unknown
6a062d4930 Merge mysql.com:/home/wax/mysql/mysql-4.0
into mysql.com:/home/wax/mysql/mysql-4.0chsize
2003-08-13 02:52:17 +06:00
unknown
78f2ed2cfb Merge serg.mylan:/usr/home/serg/Abk/mysql
into serg.mylan:/usr/home/serg/Abk/mysql-4.0


isam/_search.c:
  Auto merged
2003-08-12 19:22:30 +02:00
unknown
7e7edcf9b6 isam SEARCH_LAST bug fixed 2003-08-12 19:21:38 +02:00
unknown
b7efbc3fd4 myisamchk - don't mark table as crashed if --sort-records=<key> failed because of unappropriate key or read-only table 2003-08-12 15:56:55 +02:00
unknown
1301a6c42d Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-12 15:30:47 +02:00
unknown
f4e26a8bad MyISAM was erroneously using max_ref_length when estimating min_pack_length. 2003-08-12 15:30:20 +02:00
unknown
8e6ff087df snprintf compatibility fix 2003-08-12 15:28:36 +02:00
unknown
b0700aff80 - added option "--pull" to be able to update the BK repositories before
starting the bootstrap
2003-08-12 13:49:11 +02:00
unknown
74bab1fe02 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-12 01:33:55 +03:00
unknown
20901edafb Remove wrong bug fix when calling create_sort_index.
Fix possible replication bug with LOAD DATA ... IGNORE LINES #


mysql-test/r/rpl_log.result:
  Test of load data ... ignore # lines
mysql-test/t/rpl_log.test:
  Test of load data ... ignore # lines
sql/log_event.cc:
  Fix replication bug with LOAD DATA ... IGNORE LINES #
  (Note that the code that is probably not executed in 4.0)
sql/sql_parse.cc:
  Indentation fix
sql/sql_select.cc:
  Remove wrong bug fix (all tests passes)
sql/sql_yacc.yy:
  Indentation cleanup
2003-08-10 05:14:16 +03:00