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
bell@laptop.sanja.is.com.ua
30913419ec
after merge changing
...
uninitialized value fixed
2003-08-20 17:35:12 +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
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
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
bell@laptop.sanja.is.com.ua
dd9cbce47b
merge
2003-08-19 20:14:35 +03: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
monty@mashka.mysql.fi
eb6458cb18
After merge fixes + bugs from last merge
2003-08-19 16:00:12 +03: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
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
bar@bar.mysql.r18.ru
9b5deb8fe1
Adding Gerogian GEOSTD8 character set
2003-08-18 17:27:09 +05: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
bell@laptop.sanja.is.com.ua
85f397781b
Code cleanup
2003-08-16 13:26:48 +03:00
bell@laptop.sanja.is.com.ua
55094f903f
As far as now transformer called after setup_wild() it is impossible to have '*'
2003-08-16 02:04:29 +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
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
bell@sanja.is.com.ua
758129279f
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-08-13 10:12:41 +03:00
bell@sanja.is.com.ua
6250e76381
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-qc-4.1
2003-08-12 23:45:53 +03:00
bell@sanja.is.com.ua
57bb575d49
fixed query cache intercommunication with innodb engine
2003-08-12 23:45:04 +03:00
serg@serg.mylan
7c5ba4f6fa
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-08-12 19:44:13 +02:00
bell@sanja.is.com.ua
341d5aa036
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-collation-4.1
2003-08-12 19:21:03 +03:00
bell@sanja.is.com.ua
62849952df
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-having_resolve-4.1
2003-08-12 18:44:48 +03:00
bell@sanja.is.com.ua
011d905391
merge
2003-08-12 17:48:58 +03:00
bell@sanja.is.com.ua
0cbbca70b0
fixed layout
2003-08-12 17:40:11 +03: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
147b34e2f4
snprintf compatibility fix
2003-08-12 15:28:36 +02:00
bell@sanja.is.com.ua
b6a8d68ae4
fixed problem with reference on derived table fields (BUG#1031)
2003-08-12 15:04:49 +03:00
bar@bar.mysql.r18.ru
e5e81f45a0
LIKE didn't work with non-default charset
2003-08-12 16:42:52 +05:00
monty@mashka.mysql.fi
2263e3e51f
Merge with 4.0.14
2003-08-11 22:44:43 +03:00
dlenev@mysql.com
c767f0b2a0
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-345
2003-08-11 23:43:54 +04:00
dlenev@dlenev.mshome
921ac8af8b
Implemented UTC_TIME, UTC_DATE and UTC_TIMESTAMP functions (WL#345)
2003-08-11 23:43:01 +04:00
bell@sanja.is.com.ua
b518e93b4a
fixed collation of Item_cache family (BUG#951)
2003-08-11 20:48:51 +03:00
serg@serg.mylan
fc5c059f98
Merge bk-internal:/home/bk/mysql-4.1/
...
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
2003-08-11 18:48:02 +02:00
bar@bar.mysql.r18.ru
786af34146
Fix: create table t1 (a char(10) character set cp1251) SELECT _koi8r'blabla' as a
...
The above query created a field of koi8r charset, not cp1251
Change:
CREATE TABLE a (a CHAR(1) CHARACTER SET utf8)
Length now means character length, not byte length.
The above creates a field that guarantees can store a multibyte value
1 character long. For utf8 the above creates a field that can store
3 bytes.
2003-08-11 18:18:34 +05:00
bell@sanja.is.com.ua
734a953e27
after merge fix
2003-08-11 13:17:48 +03:00
bell@sanja.is.com.ua
71b39c3020
Merge sanja.is.com.ua:/home/bell/mysql/bk/work-top3-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-simple_in-4.1
2003-08-11 11:57:37 +03:00
bell@sanja.is.com.ua
a0fda66f00
merge
2003-08-11 11:51:33 +03:00