Commit graph

9332 commits

Author SHA1 Message Date
marko@hundin.mysql.fi
459fa7f1f9 After merge fixes 2005-02-02 11:50:27 +02:00
acurtis@pcgem.rdg.cyberkinetica.com
a90d28eb6e Fix compile problem - line missing. 2005-02-01 23:43:09 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
9cfe250419 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/wl1967
2005-02-01 19:57:42 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
a67924ecbc WL#1967
Support for COMMIT/ROLLBACK optional arguments
2005-02-01 19:48:05 +00:00
marko@hundin.mysql.fi
dabb56a7cb After merge fixes 2005-02-01 10:24:09 +02:00
reggie@bob.(none)
6c272a5a35 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into bob.(none):/home/reggie/bk/mysql5.0
2005-01-31 22:26:12 -06:00
reggie@bob.(none)
fe675641eb Merge bob.(none):/home/reggie/bk/mysql41
into bob.(none):/home/reggie/bk/mysql5.0
2005-01-31 22:24:04 -06: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
b7dda3f7c0 Merge 2005-01-31 16:27:17 -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
acurtis@pcgem.rdg.cyberkinetica.com
941b959cb4 Bug#7011
Fix for merge from 4.1
2005-01-31 20:49:37 +00: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
adb91423ac Bug#7011
Merge from 4.1
2005-01-31 15:57:32 +00: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
2693b5ffa3 InnoDB: Cleanups of TRUNCATE TABLE code 2005-01-31 10:35:56 +02: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
dlenev@mysql.com
922f0b007c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-29 19:57:29 +03: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
serg@serg.mylan
19186b6238 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-01-28 17:15:51 +01:00
serg@serg.mylan
852f2e0aba small Makefile.am cleanup
clean: targets removed
    generated *.h files moved to include/
2005-01-28 17:14:03 +01:00
dlenev@mysql.com
10a9434ccd Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-28 19:09:28 +03:00
gluh@gluh.mysql.r18.ru
5dfcdcc026 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
2005-01-28 19:09:27 +03:00
gluh@gluh.mysql.r18.ru
0434ecced3 A fix: 'information_schema' test with ps-protocol option fails
table_list->schema_table_name may be 0 in this case and 'strcasecmp' is 
not necessary in this case.
2005-01-28 19:08:27 +03: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
marko@hundin.mysql.fi
2f63bccc66 Merge marko@bk-internal.mysql.com:/home/bk/mysql-5.0
into hundin.mysql.fi:/home/marko/j/mysql-5.0
2005-01-28 14:01:02 +02:00
marko@hundin.mysql.fi
8342958665 InnoDB: Allow concurrent TRUNCATE and INSERT on a table. (Bug #8144) 2005-01-28 12:18:33 +02:00
dlenev@mysql.com
2276bfa374 Manual merge of fixes for bugs #7899 "CREATE TABLE .. SELECT .. and
CONVERT_TZ() function does not work well together" and bug #7705 
"CONVERT_TZ() crashes with subquery/WHERE on index column" in 5.0
tree.
2005-01-28 10:22:50 +03: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
pekka@mysql.com
8480b22122 Merge 2005-01-27 18:41:23 +01: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
gluh@gluh.mysql.r18.ru
9cb334f490 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0.last
2005-01-27 18:23:05 +03:00
marko@hundin.mysql.fi
4117949ace InnoDB: Tolerate negative return values from ftell(). 2005-01-27 14:05:44 +02:00
ingo@mysql.com
48488e483a Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-27 12:18:02 +01: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
gluh@gluh.mysql.r18.ru
ac14d40dde A fix: information_schema test fails on Mac OSX 2005-01-27 13:16:51 +03:00
ingo@mysql.com
160541b5d4 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-27 08:32:46 +01:00
ingo@mysql.com
98ef0b2b26 Test bug: Memory leak in archive handler.
Added a call to close the meta file after a repair.
2005-01-26 22:31:42 +01:00
ingo@mysql.com
1b02e18820 Merge mysql.com:/home/mydev/mysql-5.0
into mysql.com:/home/mydev/mysql-5.0-5000
2005-01-26 21:09:16 +01:00
patg@patrick-galbraiths-computer.local
9103a44908 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-5.0
into patrick-galbraiths-computer.local:/Users/patg/mysql-5.0
2005-01-26 11:53:33 -08:00
patg@patrick-galbraiths-computer.local
097bc9294c changes to get rid of compile warnings in both ha_federated.cc and ha_federated.h 2005-01-26 11:47:28 -08: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
dlenev@mysql.com
d8f0b7bec6 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg7637
2005-01-26 18:36:18 +03:00
ingo@mysql.com
bbcd542917 Merge from 4.1
Archive fix by Ingo.
Innodb compile fix by Monty.
2005-01-26 15:51:46 +01:00