Commit graph

7886 commits

Author SHA1 Message Date
venu@myvenu.com
97a2c472bc Resolve merge conflict 2003-05-21 00:14:56 -07:00
venu@myvenu.com
39cbb547d4 Resolve merge colflict 2003-05-21 00:12:09 -07:00
venu@myvenu.com
9ad75823e7 Fix for Windows build by adding pack.c to appropriate .dsp files 2003-05-20 23:44:28 -07:00
venu@myvenu.com
08e10a976a Added mysql_fetch_column function
Added MYSQL_TYPE_NULL as a dummy bind case for fetch buffers
Fix for offset based re-fetch using mysql_fetch_column
Misc cleanups for ODBC compatibility
2003-05-20 23:41:15 -07:00
vva@eagle.mysql.r18.ru
666d46b6ee Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-4.1
2003-05-20 17:03:50 -04:00
vva@eagle.mysql.r18.ru
ec247fd6af changed processing of LOAD DATA in mysqlbinlog 2003-05-20 17:03:18 -04:00
bar@bar.mysql.r18.ru
5b788e660a A separate, better error message when it's impossible to aggregate strings for some operation 2003-05-20 16:36:59 +05:00
guilhem@mysql.com
b0062813e5 Version substitution so that tests pass on any build, independently of the
version is '-log', '-debug' etc.
2003-05-20 10:16:26 +02:00
bell@sanja.is.com.ua
d58b4bed4c new error message 2003-05-19 15:06:17 +03:00
monty@narttu.mysql.fi
524878e935 Fix for when compiling with HAVE_ISAM enabled 2003-05-19 11:53:42 +03:00
monty@narttu.mysql.fi
dad4025e3f Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-19 11:09:46 +03:00
monty@narttu.mysql.fi
755c89e29f Add empty() function for baselist. 2003-05-19 11:09:24 +03:00
guilhem@mysql.com
e9c2a37008 LOCAL is an alias of NO_WRITE_TO_BINLOG 2003-05-16 15:28:17 +02:00
guilhem@mysql.com
3d784a4177 changes to mysqladmin : use queries instead of commands (so that they have a chance to go
into the binlog), SLAVE START -> START SLAVE, error test changes.
2003-05-15 23:00:58 +02:00
guilhem@mysql.com
50c9a79826 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-05-15 18:36:29 +02:00
guilhem@mysql.com
4a0e006230 Scrum task 845. Thi is a behaviour change :
now by default, FLUSH, OPTIMIZE, ANALYZE, REPAIR commands are written to the
binlog, unless the new NO_WRITE_TO_BINLOG keyword was used :
OPTIMIZE NO_WRITE_TO_BINLOG table t;

Previously these commands were never written to the binlog, but there are
2 reasons to change this :
- the RENAME TABLE in MERGE table bug (#175) on slave
- the possible "differently optimised queries may lead to different
updates on the master and slave" bug, until we have automatic ORDER BY.

FLUSH LOGS/SLAVE/MASTER/TABLES WITH READ LOCK are never written to the binlog.
New test for the new logging behaviour.
Other small change : reload_acl_and_cache() and reset_slave() don't send their errors themselves,
this is more usual.
2003-05-15 18:35:39 +02:00
monty@narttu.mysql.fi
e2fc4f0b71 Fix to get thread_test to compile 2003-05-15 17:50:57 +03:00
monty@narttu.mysql.fi
836216f4df Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-15 15:52:00 +03:00
monty@narttu.mysql.fi
09c98127cb Remove warning from automake 2003-05-15 15:51:42 +03:00
bar@bar.mysql.r18.ru
080eb641fa configure.in:
./configure --with-charset=big5  didn't work
2003-05-15 16:57:34 +05:00
monty@narttu.mysql.fi
c935709140 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-05-15 00:31:32 +03:00
monty@narttu.mysql.fi
04004534ea Fixed new bug in ORDER BY 2003-05-15 00:31:12 +03:00
guilhem@mysql.com
da0e28b7d6 Proper replication of CONNECTION_ID() and 4.1 PASSWORD() (bugs 177 and 344),
new test for this.
2003-05-13 22:50:28 +02:00
monty@mashka.mysql.fi
60dfb25be3 Give warning if MySQL doesn't honor given storage engine
Allow syntax CREATE TABLE t1 (LIKE t2)
2003-05-13 11:15:11 +03:00
monty@mashka.mysql.fi
091d6f3b73 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mashka.mysql.fi:/home/my/mysql-4.1
2003-05-06 06:21:40 +03:00
monty@mashka.mysql.fi
1e2f2ae037 Varbinary should be string as default 2003-05-06 06:20:16 +03:00
monty@narttu.mysql.fi
c858d72588 merge 2003-05-06 01:42:33 +03:00
monty@narttu.mysql.fi
51f9879008 Removed compiler warnings
Fixed memory leak in new filesort code
Optimzed sub selects to use keys with outer references.
Increased max tables in join to 62
2003-05-06 01:38:38 +03:00
serg@serg.mylan
8bb08c512d Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-05-03 13:15:52 +02:00
Sinisa@sinisa.nasamreza.org
f712c21343 Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
2003-05-03 14:00:59 +03:00
Sinisa@sinisa.nasamreza.org
d09462e25d removing unnecessary patch. 2003-05-03 13:59:41 +03:00
serg@serg.mylan
784fb81426 INSERT ... UPDATE ... VALUES() 2003-05-03 01:16:56 +02:00
monty@narttu.mysql.fi
ee8190f293 Merge 2003-05-02 15:22:04 +03:00
venu@myvenu.com
55f2e01879 make_win_src_distribution.sh:
Fix for bdb/cxx as they contain .cpp files directly ( for 4.0 to go )
2003-04-30 09:42:08 -07:00
serg@serg.mylan
0f653b6fed make compilation to work w/o InnoDB as well 2003-04-30 14:15:24 +02:00
pem@mysql.com
8cf4e72923 Fixed bug in Item_func_compress::val_str() on MacOS X (bigendian); the length
was not properly stored in the buffer.
2003-04-30 13:10:53 +02:00
venu@myvenu.com
72196c9b16 Updated warning test
Updated all tests to catchup warnings for all field conversions
2003-04-30 00:07:37 -07:00
venu@myvenu.com
eb137c063c Support of warnings for all DML statements (Insert, Update and Alter)
Fix LOAD DATA INFILE warnings to have a better meanigful messages
Fix to make the mysql command line to automatically show the warnings count for all basic commands
2003-04-30 00:02:28 -07:00
venu@myvenu.com
23a522c026 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into myvenu.com:/home/venu/work/sql/dev-4.1
2003-04-28 22:58:19 -07:00
bell@laptop.sanja.is.com.ua
7f51b1d3e4 Documentation fixed according bug 185 fixing patch (1.1551 03/04/23 00: 2003-04-28 20:40:41 +03:00
hf@deer.mysql.r18.ru
6a83d37532 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.cursor
2003-04-28 14:29:22 +05:00
hf@deer.mysql.r18.ru
d69b5c4d69 SCRUM
Protocol_cursor task
net_field_length definitions trimmed with Monty's suggestions
2003-04-28 14:25:29 +05:00
Sinisa@sinisa.nasamreza.org
6fd764a662 Post-merge fix. 2003-04-26 15:58:39 +03:00
Sinisa@sinisa.nasamreza.org
5dc8dbea5f merge fix 2003-04-26 15:26:28 +03:00
Sinisa@sinisa.nasamreza.org
3ca1a152eb Making a better fix for double released pointers and safe
TMP_TABLE_PARAM.
This involved moving things around in include files.
All tests, including the ones with Valgrind passed.
2003-04-26 15:12:14 +03:00
guilhem@mysql.com
050d5b5487 forgot to commit this one in cset 1.1561 (replication) 2003-04-25 12:31:51 +02:00
guilhem@mysql.com
66e97ba570 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-04-24 17:42:07 +02:00
igor@hundin.mysql.fi
517a287ec9 Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/igor/dev/mysql-4.1
2003-04-24 18:42:06 +03:00
vva@eagle.mysql.r18.ru
855a6b8274 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/COMPRESS_UNCOMPRESS/mysql-4.1
2003-04-24 11:42:05 -04:00
vva@eagle.mysql.r18.ru
0f33b2f0cb added '.' to end of compressed string 2003-04-24 11:37:55 -04:00