bell@sanja.is.com.ua
85f62aa67c
Merge abelkin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
2005-02-01 13:55:40 +02:00
bell@sanja.is.com.ua
48da18cd45
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
...
into sanja.is.com.ua:/home/bell/mysql/bk/work-4.1
2005-02-01 11:05:29 +02:00
marko@hundin.mysql.fi
dabb56a7cb
After merge fixes
2005-02-01 10:24:09 +02:00
jimw@mysql.com
de16b5f48f
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-31 17:32:22 -08:00
jimw@mysql.com
4b8d81ff1e
Merge mysql.com:/home/jimw/my/mysql-4.1-6511
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-31 15:30:34 -08:00
reggie@bob.(none)
16334eb414
Bug #6607 Create table... LIKE... with Windows Symlinks
...
sql_table.cc:
use fn_format to resolve symlinks in mysql_create_like_table
2005-01-31 17:24:18 -06:00
heikki@hundin.mysql.fi
c2a59e83af
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-31 22:30:40 +02:00
brian@zim.(none)
6471b65ad0
Removed duplicate close call and added archive to the debug build and test.
2005-01-31 12:17:34 -08:00
brian@zim.(none)
630e020d3e
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-01-31 11:03:57 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
6a354b1b04
Bug#7011
...
Merge from 4.0
2005-01-31 12:48:00 +00:00
marko@hundin.mysql.fi
344b774d7c
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-01-31 09:34:34 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
500fbf5c0f
Bug#7011
...
Fix replication for multi-update
new test - rpl_multi_update2
2005-01-30 10:24:03 +00:00
brian@zim.(none)
69de46a8de
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-01-28 18:10:47 -08:00
brian@zim.(none)
b484e29231
Cleanup for lost file descriptors on close table for ha_archive.
2005-01-28 16:43:10 -08:00
heikki@hundin.mysql.fi
9218a06eca
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-28 20:50:16 +02:00
dlenev@mysql.com
09b08edcc5
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
2005-01-28 17:43:59 +03:00
marko@hundin.mysql.fi
70799de479
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-01-28 14:17:49 +02:00
dlenev@mysql.com
c80c503a1b
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
2005-01-28 09:32:43 +03:00
heikki@hundin.mysql.fi
61a0e57cd0
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-27 21:33:15 +02:00
pekka@mysql.com
521f736737
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/export/space/pekka/ndb/version/my41
2005-01-27 18:12:04 +01:00
pekka@mysql.com
5cbadf4358
ndb - make YEAR and TIMESTAMP into ndb types
2005-01-27 17:33:35 +01:00
marko@hundin.mysql.fi
4117949ace
InnoDB: Tolerate negative return values from ftell().
2005-01-27 14:05:44 +02:00
ingo@mysql.com
fd352fd00e
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-27 12:01:19 +01:00
bar@mysql.com
858171cb6f
item_timefunc.cc:
...
CAST now always return a well-formed character string.
2005-01-27 14:51:16 +04:00
dlenev@brandersnatch.localdomain
80282016c2
Fix for bug #7899 "CREATE TABLE .. SELECT .. and CONVERT_TZ() function
...
does not work well together". Now using simplier and more correct
implementation of st_lex::unlink_first_table()/link_first_table_back()
(It also nicely handles case when global table list is created because
of implictly used time zone tables). (2nd attempt)
Fix for bug #7705 "CONVERT_TZ() crashes with subquery/WHERE on index
column". Implemented new approach for caching objects for constant
time zone arguments. Now instead of determining whenever these arguments
are constants and performing time zone lookup at fix_fields() stage, we
do it on first get_date() invocation.
Cleanup of global @@time_zone variable handling.
2005-01-26 22:25:02 +03:00
ingo@mysql.com
300337cee7
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-26 15:31:06 +01:00
ingo@mysql.com
5ad151aa21
Test Bug: Memory leaks in the archive handler.
...
Moved initialization code into a new init function.
Added a new cleanup function.
Added a call to close the meta file.
2005-01-26 15:27:31 +01:00
bell@sanja.is.com.ua
0bf6e3aefc
fixed cleanup of result object of subqueries. (BUG#8125)
2005-01-26 15:27:45 +02:00
ram@gw.mysql.r18.ru
7f6fca4cf0
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1
2005-01-26 17:09:38 +04:00
marko@hundin.mysql.fi
86da2b8f40
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0
...
into hundin.mysql.fi:/home/marko/k/mysql-4.0
2005-01-26 14:07:40 +02:00
tomas@poseidon.ndb.mysql.com
1a331191a3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-26 11:32:22 +01:00
tomas@poseidon.ndb.mysql.com
5779a6a576
Bug#8101 unique indexes which attribute are _not_ specified in the order of the table does not work
2005-01-26 11:31:46 +01:00
tomas@poseidon.ndb.mysql.com
9259dd1d81
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-26 09:42:52 +01:00
ingo@mysql.com
5ea224b824
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-26 09:09:53 +01:00
ingo@mysql.com
f003fb1f9c
Merge mysql.com:/home/mydev/mysql-4.0
...
into mysql.com:/home/mydev/mysql-4.0-4000
2005-01-26 09:07:25 +01:00
serg@serg.mylan
7084b494c4
innobase/include/univ.i
...
remove a change that broke the test
2005-01-26 08:57:43 +01:00
igor@rurik.mysql.com
34fa69a194
order_by.result, order_by.test:
...
Added a test case for bug #7672 .
sql_yacc.yy:
Fixed bug #7672 .
Made queries of the form (SELECT ...) ORDER BY ... to
be equivalent to SELECT ... ORDER BY ...
2005-01-25 14:30:38 -08:00
heikki@hundin.mysql.fi
9a6e0d06e0
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into hundin.mysql.fi:/home/heikki/mysql-4.1
2005-01-25 22:12:22 +02:00
heikki@hundin.mysql.fi
d7e5c4d617
sql_class.h, set_var.cc, mysqld.cc:
...
Add settable variables for semi-sync replication
2005-01-25 22:11:21 +02:00
jimw@mysql.com
94da57dc65
Always call vio_in_addr() so that thd->remote is
...
always initialized. (Bug #5569 )
2005-01-25 12:06:55 -08:00
tomas@poseidon.ndb.mysql.com
5f33acc006
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-25 20:55:29 +01:00
monty@mysql.com
37168015cd
Cleanups during review
2005-01-25 21:27:51 +02:00
marko@hundin.mysql.fi
638e2bd733
InnoDB: Backport innodb_autoextend_increment from 4.1
2005-01-25 16:27:13 +02:00
mskold@mysql.com
da658b9f11
Fix for failing INSERT IGNORE in test ndb_insert
2005-01-25 15:08:51 +01:00
tomas@poseidon.ndb.mysql.com
d8fe3d01af
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-01-25 13:48:12 +01:00
tomas@poseidon.ndb.mysql.com
b4eebbc0b6
changed from using column names to column id in ndb setBound in ha_ndbcluster
2005-01-25 13:46:40 +01:00
ingo@mysql.com
88c434a905
Merge mysql.com:/home/mydev/mysql-4.1
...
into mysql.com:/home/mydev/mysql-4.1-4100
2005-01-25 09:06:11 +01:00
ram@gw.mysql.r18.ru
8c043a299b
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into gw.mysql.r18.ru:/usr/home/ram/work/4.1.b7261
2005-01-25 11:06:12 +04:00
jimw@mysql.com
09aaba03cf
Merge mysql.com:/home/jimw/my/mysql-4.1-7887
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-24 12:47:19 -08:00
jimw@mysql.com
fa1098618e
Set lower_case_file_system when it is being tested to check if
...
lower_case_tables_names=2 is sensible. Related to Bug #7887 .
2005-01-24 12:31:14 -08:00