Commit graph

6798 commits

Author SHA1 Message Date
guilhem@mysql.com
ec280a51ca Result updates after Dmitri's and my changes to logging with --log-slave-updates.
Since my changes, rpl_log.test, whose result file depends on file_id, became
non-repeatable, i.e. file_id on slave in SHOW BINLOG EVENTS
changed depending on the order of tests (sometimes 1, sometimes 5).
Which is logical: as now the slave does not copy Create_file and Exec_load from
the relay log (i.e from the master's binlog) to the slave's binlog, but
instead lets mysql_load() do the logging, the file_id is now the one whic
was used on the slave. Before it was the one which was used on the master,
and by chance the master was always restarted for this test because there's
a -master.opt file, so file_id on the master is always 1. But now file_id is
from the slave so we need to restart the slave. That's why I add an (empty)
-slave.opt file. I could have used 'server_stop/start slave', but this
would have required the manager, so most of the time mysql-test-run silently
skip the test which makes it useless. And I want this test to be run !
2003-08-21 00:23:39 +02:00
guilhem@mysql.com
f405287beb Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.0
2003-08-20 23:25:58 +02:00
guilhem@mysql.com
1dd53ed073 First commit for fixing BUG#1100
"LOAD DATA INFILE is badly filtered by binlog-*-db rules".
There will probably be a second final one to merge Dmitri's changes
to rpl_log.result and mine.
2 new tests:
rpl_loaddata_rule_m : test of logging of LOAD DATA INFILE when the master has binlog-*-db rules,
rpl_loaddata_rule_s : test of logging of LOAD DATA INFILE when the slave has binlog-*-db rules and --log-slave-updates.
2003-08-20 23:24:45 +02:00
dlenev@mysql.com
423b1b7c4a 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
monty@narttu.mysql.fi
23f0de0867 Fixed problem with undefined assert symbol 2003-08-20 17:16:07 +03:00
dlenev@mysql.com
319017ae9f 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
monty@narttu.mysql.fi
359846f052 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
2003-08-20 16:25:44 +03:00
dlenev@mysql.com
bb96092202 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)
2003-08-20 03:38:31 +04:00
serg@serg.mylan
4877e908db 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
serg@serg.mylan
e5fd812d51 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
lenz@mysql.com
9f92664c69 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
lenz@mysql.com
12f3449c74 - Added a missing directory variable definition to the Bootstrap script. 2003-08-19 18:34:44 +02:00
guilhem@mysql.com
6e32e19047 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.
2003-08-19 17:00:36 +02:00
guilhem@mysql.com
1a5c8be408 Fix for BUG#1096 which is:
"mysqlbinlog does not comment the original LOAD DATA INFILE if it has a "use xx""
2003-08-19 15:46:47 +02:00
guilhem@mysql.com
83f35b8a81 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
monty@mashka.mysql.fi
0d01cc56bd 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
guilhem@mysql.com
fefa92f3a7 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
2003-08-19 15:12:44 +02:00
monty@mashka.mysql.fi
ff63a5c3d9 Fix test case 2003-08-19 16:03:18 +03:00
lenz@mysql.com
21ce7a4da1 - 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.
2003-08-19 13:57:58 +02:00
lenz@mysql.com
d8c31db54b - Optimized and cleaned up the Do-rpm and Bootstrap Perl scripts
- Enhanced Do-rpm to support building RPMs with different compilers
   and options
2003-08-19 13:49:53 +02:00
bell@laptop.sanja.is.com.ua
39a65cd777 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
monty@narttu.mysql.fi
bb837f3506 fixed typo in last push 2003-08-17 14:37:26 +03:00
monty@narttu.mysql.fi
7b13560ce7 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into narttu.mysql.fi:/my/mysql-4.0
2003-08-17 14:10:45 +03:00
monty@narttu.mysql.fi
d79cbc3b99 Fix mutex handling in SHOW_VARIABLES (key_buffer_size was not properly protected)
Changed some non fatal myisamchk error messages to warnings
2003-08-17 14:10:15 +03:00
jani@rhols221.adsl.netsonic.fi
2a53d5a60e 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
lenz@mysql.com
927dff6c47 - 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
2003-08-15 14:55:05 +02:00
monty@mashka.mysql.fi
ced77791a9 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
monty@mashka.mysql.fi
a9146ace70 Cleanups to recent patches
Fix packet error when using wrong GRANT command
2003-08-15 09:54:19 +03:00
bell@laptop.sanja.is.com.ua
e9e5faacfe 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
gweir@build.mysql.com
fe511fc489 make_win_src_distribution.sh:
Add --zip option for finer grain control over what package formats are created
Bootstrap:
  Create both Windows source packages
2003-08-13 19:32:34 +02:00
gweir@build.mysql.com
225eda66ce make_win_src_distribution.sh:
'tools' contains intermediate files
2003-08-13 17:00:22 +02:00
gweir@build.mysql.com
c369236517 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
gweir@build.mysql.com
51008b109c 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
gweir@build.mysql.com
0bf0fba847 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
monty@mashka.mysql.fi
fb47e64256 Merge bk-internal.mysql.com:/home/bk/mysql-4.0
into mashka.mysql.fi:/home/my/mysql-4.0
2003-08-13 13:26:52 +03:00
lenz@mysql.com
6e8426cc9c - we are already in $target_dir, no need to prepend it to the build
command.
2003-08-13 07:24:35 +02:00
lenz@mysql.com
c90df7192e Fixed typo in the Boostrap strip 2003-08-13 07:12:08 +02:00
gweir@build.mysql.com
cde03a0183 make_win_src_distribution.sh:
Copy some previously missed files
2003-08-13 04:52:03 +02:00
gweir@build.mysql.com
d7367dea43 Bootstrap:
Corrections to Bootstrap for --win-dist
2003-08-13 02:13:45 +02:00
lenz@mysql.com
e0ce94a446 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
wax@mysql.com
df3b982195 nothing interesting 2003-08-13 03:22:34 +06:00
lenz@mysql.com
94c7024eaa - 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
2003-08-12 23:21:21 +02:00
wax@mysql.com
67f41574a0 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
serg@serg.mylan
83de458e91 Merge serg.mylan:/usr/home/serg/Abk/mysql
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-12 19:22:30 +02:00
serg@serg.mylan
3ec7456f8d isam SEARCH_LAST bug fixed 2003-08-12 19:21:38 +02:00
serg@serg.mylan
ba28624c26 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
serg@serg.mylan
bc9f6cde50 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
serg@serg.mylan
06e5657993 MyISAM was erroneously using max_ref_length when estimating min_pack_length. 2003-08-12 15:30:20 +02:00
serg@serg.mylan
147b34e2f4 snprintf compatibility fix 2003-08-12 15:28:36 +02:00
lenz@mysql.com
ad976d1ea1 - added option "--pull" to be able to update the BK repositories before
starting the bootstrap
2003-08-12 13:49:11 +02:00