Commit graph

3619 commits

Author SHA1 Message Date
serg@serg.mysql.com
80c34b2aef fixed Field::eq() to work with CHAR(0) fields 2003-03-04 18:02:56 +01:00
Sinisa@sinisa.nasamreza.org
4d83bdef2a Fix for SHOW VARIABLES on 64-bit platforms 2003-03-04 18:23:15 +02:00
bar@bar.mysql.r18.ru
78da2ad7bd SELECT BINARY expr
is now synonim for
SELECT expr COLLATE <expr_charset>_bin
2003-03-04 19:53:53 +04:00
bar@bar.mysql.r18.ru
f95eb82934 stringcmp() and sortcmp() have been unified
into the only one sortcmp() with additional
CHARSET_INFO *cmp_charset argument.
2003-03-04 18:01:59 +04:00
monty@narttu.mysql.fi
143c85057e Fix for reading variables from binary log. 2003-03-04 15:17:29 +02:00
monty@narttu.mysql.fi
d0d071dca9 Fix for using unitialized mutex when running version compiled with --debug 2003-03-04 15:02:49 +02:00
monty@narttu.mysql.fi
21cc72bfe8 Merge with 3.23 to get fix for deadlock when doing LOCK TABLES in one thread and DROP TABLE in another thread 2003-03-04 13:36:59 +02:00
monty@narttu.mysql.fi
28b6e0269a Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 2003-03-04 12:32:28 +02:00
monty@narttu.mysql.fi
2a7dfa172c Fixed bug in LOCK TABLE + DROP TABLE when other thread was waiting for a table that was locked bug not droped 2003-03-04 12:22:35 +02:00
bar@bar.mysql.r18.ru
6cbbbd6948 Fix for SHOW, it didn't display CHARACTER SET and COLLATE clause
for binary collations
2003-03-04 12:33:52 +04:00
bar@bar.mysql.r18.ru
c4dc670d61 Every character set now has binary collation 2003-03-04 11:04:19 +04:00
guilhem@mysql.com
dc634a18e9 Do not give an error when the user does START SLAVE on an already
running slave, just give a warning. Same thing for STOP SLAVE.
This will make scripts writing easier for users.
2003-03-03 23:12:17 +01:00
monty@narttu.mysql.fi
8c51eb2c12 Fixed a deadlock problem when using LOCK TABLE in one thread and DROP TABLE in another 2003-03-03 20:42:49 +02:00
heikki@hundin.mysql.fi
6ef0f4ad41 ha_innodb.h, ha_innodb.cc, handler.h, handler.cc, sql_class.cc:
Fix a hang on the adaptive hash S-latch if an application program uses mysql_use_result() and performs queries on two connections at the same time
2003-03-03 19:31:01 +02:00
Sinisa@sinisa.nasamreza.org
7dc464ea07 Merge sinisa@work.mysql.com:/home/bk/mysql
into sinisa.nasamreza.org:/mnt/work/mysql
2003-03-03 17:16:09 +02:00
guilhem@mysql.com
6b4f438ddb Replication: small bug fixes in mysql-test-run.sh and in replication code (more reinitializations)
+ fix for #70 
+ test result fix for LOAD DATA LOCAL bug #82
2003-03-03 14:57:02 +01:00
bar@bar.mysql.r18.ru
4ffd74e5de Coercibility is now stored in user vars 2003-03-03 13:16:39 +04:00
bar@bar.mysql.r18.ru
48cdd97866 Strings which appear without charset context,
like number-to-string-convertion-result, now 
takes current database character set, instead of
thread character set. This makes it easy to be
SQL99 conformant and 4.0 compatible.

Item->thd_charset() is renamed to Item->default_charset()
as old name doesn't describe its nature anymore.
2003-03-03 10:53:08 +04:00
bell@sanja.is.com.ua
b2f27a155c made variable query_cache_min_res_unit from QUERY_CACHE_MIN_RESULT_DATA_SIZE (SCRUM) 2003-03-02 21:39:03 +02:00
guilhem@mysql.com
49788cf2e1 ChangeSet 1.1625 was faulty as regards sql/mf_iocache.cc and LOAD DATA LOCAL replication tests 2003-03-02 18:20:32 +01:00
wax@kishkin.ru
15e69055a1 URGENT fixed bug in shared memory (handler_count) 2003-03-02 19:35:37 +05:00
serg@serg.mysql.com
31d87cd50c optimizer should check for "field LIKE const" not "field like STRING" 2003-03-02 14:07:32 +01:00
bar@bar.mysql.r18.ru
f9bf53fa67 sql_yacc.yy:
Produce an error when a field collation and charset are not compatible
2003-03-02 14:47:56 +04:00
bar@bar.mysql.r18.ru
475e64520b New error message for situation like:
SELECT latin1_expr COLLATE anpther_charset_collation
2003-03-02 14:05:03 +04:00
serg@serg.mysql.com
d77cd3835d Merge work:/home/bk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
2003-03-02 01:52:02 +01:00
serg@serg.mysql.com
be580475be fix auto-increment in sub-key and insert ... select 2003-03-02 01:48:57 +01:00
guilhem@mysql.com
e66992aef5 Replication: simplification of init_relay_log_pos: always initialize,
remove variable rli->log_pos_current.
2003-03-02 00:45:19 +01:00
guilhem@mysql.com
10735252ee When the SQL thread cannot read an event from the relay log
("Event too big" etc), stop this thread instead of going on
with the next event, which would certainly lead to slave's data
corruption.
2003-03-02 00:34:44 +01:00
papa@gbichot.local
264d8c095d Replication: give the slave I/O thread a higher priority than the slave SQL thread
so that it has fetched the most from the master's binlog before the master
accidently dies. SCRUM task #756.
2003-03-01 23:59:27 +01:00
serg@serg.mysql.com
35636c6bd0 Merge work:/home/bk/mysql-4.1
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
2003-03-01 14:18:55 +01:00
monty@narttu.mysql.fi
065bcf92fb Merge work:/my/mysql-4.0 into narttu.mysql.fi:/my/mysql-4.0 2003-02-28 22:24:57 +02:00
monty@narttu.mysql.fi
e8aa21c8d3 LOAD DATA INFILE is not replicated if replicate_*_table is set
LOAD DATA LOCAL INFILE was not replicated correctly
2003-02-28 22:24:00 +02:00
bell@sanja.is.com.ua
e087f900e5 used correct function (SCRUM) 2003-02-28 21:17:44 +02:00
monty@narttu.mysql.fi
7eccd99e54 LOAD DATA INFILE is not replicated by slave if replicate_*_table is set 2003-02-28 19:50:05 +02:00
ram@mysql.r18.ru
8ecf3a0b21 Added GeometryFromText, MultiPointFromText aliases.
Added GeometryCollection type.
2003-02-28 21:17:08 +04:00
bar@bar.mysql.r18.ru
8def9a3e93 item_func.cc:
Fix for coercibility of function
2003-02-28 20:56:18 +04:00
bar@bar.mysql.r18.ru
cb6a0a4808 item_strfunc.cc:
Charset conversion function changes coercibility to IMPLICIT
2003-02-28 20:25:25 +04:00
bar@bar.mysql.r18.ru
35b01c8e9e sql_yacc.yy:
_charset cast changes coercibility to implicit
item_strfunc.cc:
  Collation cast change coercibility to EXPLICIT
2003-02-28 20:20:24 +04:00
bar@bar.mysql.r18.ru
3046c3ca34 Many files:
Coercibility, initial stage
item_func.h:
  Coercibility, initial stage
2003-02-28 19:22:20 +04:00
monty@narttu.mysql.fi
959e1428da Merge work:/my/mysql-4.1 into narttu.mysql.fi:/my/mysql-4.1 2003-02-28 14:33:10 +02:00
monty@narttu.mysql.fi
050543bdfc Merge with 3.23 -> 4.0 2003-02-28 13:29:48 +02:00
igor@hundin.mysql.fi
3503d4797b func_group.result:
Added new tests for better coverage of
  min/max optimization code.
func_group.test:
  Added new tests for better coverage of 
  min/max optimization code.
opt_sum.cc:
  Fixed wrong previous manual merge.
  Fixed bugs concerning fields used in min/max
  functions for which there are conditions of
  the form field=const.
2003-02-28 08:53:54 +02:00
bell@sanja.is.com.ua
47b16dae7a posreview changing (SCRUM)
increased compatibility
postmerge changing
2003-02-27 20:31:54 +02:00
bell@sanja.is.com.ua
80236063a1 merging 2003-02-27 19:38:39 +02:00
monty@narttu.mysql.fi
a0d2a621ed Added detection if pthread_attr_getstacksize() exists
Fixed bug in RAND() usage in mysqlbinlog
2003-02-27 17:35:51 +02:00
bar@bar.mysql.r18.ru
47c770b3f7 sql_yacc.yy:
set names binary  didn't work
  ,
2003-02-27 17:45:40 +04:00
bar@bar.mysql.r18.ru
8f90a0329b sql_yacc.yy, item_strfunc.cc:
Two separate functions charset() and collatio()
item_strfunc.h:
  Two separate functions charset() and collation()
2003-02-27 16:53:10 +04:00
bell@sanja.is.com.ua
7db4ec2965 fixed bug on case insensetive file systems 2003-02-27 12:45:00 +02:00
igor@hundin.mysql.fi
fa249d2d87 Merge ibabaev@work.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/igor/dev/mysql-4.1
2003-02-27 11:03:38 +02:00
bar@bar.mysql.r18.ru
e8412e9ea5 field.cc:
Now all text fields convert data into proper charset before storing
2003-02-27 12:10:41 +04:00