Commit graph

9510 commits

Author SHA1 Message Date
lenz@mysql.com
cba9cbddfc - added missing option "--without-embedded" to be able to compile without
the embedded server (it was missing in the previous push)
2003-08-21 12:15:22 +02:00
bar@bar.mysql.r18.ru
8c55440ba4 CAST(expr AS CHAR(10)) is now working 2003-08-21 14:15:25 +05:00
serg@serg.mylan
071ec76892 Merge bk-internal:/home/bk/mysql-4.0/
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
2003-08-21 10:45:43 +02:00
serg@serg.mylan
a72587ffb0 sorted 2003-08-21 10:44:17 +02:00
guilhem@mysql.com
165dc895b3 Yesterday I removed process_io_create_file; I shouldn't have.
Let's say the lack of comments did not help me ;)
Copying it back again and adding comments; now 3.23->4.0
replication of LOAD DATA INFILE works again.
2003-08-21 10:24:37 +02:00
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
bell@laptop.sanja.is.com.ua
63fc15ceeb merge 2003-08-21 00:41:08 +03: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
bell@laptop.sanja.is.com.ua
87bb62007b merge 2003-08-20 23:39:17 +03:00
bell@laptop.sanja.is.com.ua
1ab66ddad8 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-08-20 21:59:31 +03:00
bell@laptop.sanja.is.com.ua
811ed77e5f quick fix for found row counter
code cleunup
2003-08-20 21:57:37 +03:00
Sinisa@sinisa.nasamreza.org
e5b841e392 sql_union.cc:
Merge fix
2003-08-20 20:16:37 +03:00
bell@laptop.sanja.is.com.ua
11af1f3c9c Merge 2003-08-20 17:45:04 +03:00
lenz@kallisto.local
95f71c317b - make sure that both libedit and readline are added to the source
distribution. libedit is used by default, one needs to use
   "--with-readline" when compiling with readline instead.
2003-08-20 16:39:11 +02:00
bell@laptop.sanja.is.com.ua
30913419ec after merge changing
uninitialized value fixed
2003-08-20 17:35:12 +03:00
guilhem@gbichot2
8fb1d8c450 sleep instead of system sleep 2003-08-20 16:32:00 +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
Sinisa@sinisa.nasamreza.org
84c2e91f1e sql_union.cc:
Fix for SQL_CALC_FOUND_ROWS in UNION's
2003-08-20 16:14:01 +03:00
Sinisa@sinisa.nasamreza.org
5ed6551601 func_test.result, func_test.test:
Test case for the LEAST() bug in LEFT JOIN
2003-08-20 15:52:43 +03:00
Sinisa@sinisa.nasamreza.org
fb774125e8 item_func.h:
Fix for a bug with LEAST() in WHERE clause
ha_innodb.cc:
  Fix for a configure bug
multi_update.result, multi_update.test:
  Fix for the update with NULL's in the result set
sql_update.cc:
  Fix for the update with NULL's in the result set
   Fix for the update with NULL's in the result set
   Fix for the update with NULL's in the result set
2003-08-20 15:33:21 +03:00
Sinisa@sinisa.nasamreza.org
7635c537be fixing limit and SQL_CALC_FOUND_ROWS issues 2003-08-20 13:56:32 +03:00
serg@serg.mylan
ae8b080549 comment added 2003-08-20 12:27:06 +02: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
bell@laptop.sanja.is.com.ua
dd9cbce47b merge 2003-08-19 20:14:35 +03: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
Sinisa@sinisa.nasamreza.org
be67e7176a Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-08-19 16:40:31 +03:00
Sinisa@sinisa.nasamreza.org
faabb1c42c A fix for a bug with long definition of SET or ENUM.
Barkov approved it already
2003-08-19 16:35:17 +03: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
monty@mashka.mysql.fi
9333e292ec Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-08-19 16:00:36 +03:00
monty@mashka.mysql.fi
eb6458cb18 After merge fixes + bugs from last merge 2003-08-19 16:00:12 +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
serg@serg.mylan
7b873fa876 Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-08-19 11:07:57 +02:00
ram@mysql.r18.ru
ba77af7321 Removed idle MY_LEX_SIGNED_NUMBER 2003-08-19 12:49:47 +05:00
monty@mashka.mysql.fi
10c4acfb4f merge 2003-08-19 00:10:21 +03:00
monty@mashka.mysql.fi
4f7512160b After merge fixes
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
2003-08-19 00:08:08 +03:00
guilhem@mysql.com
5c57eb22d9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-3.23
into mysql.com:/home/mysql_src/mysql-3.23
2003-08-18 20:03:01 +02:00
guilhem@mysql.com
f26106fe64 Fix for 64-bit CPUs (u_long is 64 bit there, but in_addr_t is always uint32).
That's to make resolveip work on our FreeBSD-5.0/Sparc64 build host.
2003-08-18 20:01:38 +02:00