Commit graph

19341 commits

Author SHA1 Message Date
bar@mysql.com
c9c8955fc9 character_sets.m4:
--with-uca configure.in argument.
  The rest of the changes are pending from 4.1 tree
2005-02-01 11:50:43 +04:00
jimw@mysql.com
36d5d82ab5 Update client_xml test to avoid timestamp-sensitive part of test. 2005-01-31 18:48:42 -08:00
jimw@mysql.com
85a5c61c5d Merge mysql.com:/home/jimw/my/mysql-4.1-7811
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-01-31 17:51:45 -08:00
jimw@mysql.com
6056009782 Update test results after bug-fix merge. 2005-01-31 17:31:42 -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
jimw@mysql.com
61874f07df Merge mysql.com:/home/jimw/my/mysql-4.1-8134
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-31 15:29:55 -08:00
jimw@mysql.com
b4caa3aad5 Merge mysql.com:/home/jimw/my/mysql-4.1-8148
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-01-31 15:28:33 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
941b959cb4 Bug#7011
Fix for merge from 4.1
2005-01-31 20:49:37 +00: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
18084f54c7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug7011.4
2005-01-31 15:06:04 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
ba716c80f1 Bug#7011
Fix tests after merge from 4.0
2005-01-31 13:18:36 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
6a354b1b04 Bug#7011
Merge from 4.0
2005-01-31 12:48:00 +00:00
tulin@mysql.com
bc317a19ce BUG#8208 don't fsync unless something has been written
+ ion shutdown - don't close files that are not open
+ abort in debug - if closing a fd == -1
2005-01-31 11:47:10 +01:00
kent@mysql.com
52a3f0dfc1 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile
2005-01-31 10:31:59 +01:00
kent@mysql.com
89b3897005 Merge 2005-01-31 10:24:33 +01:00
marko@hundin.mysql.fi
2693b5ffa3 InnoDB: Cleanups of TRUNCATE TABLE code 2005-01-31 10:35:56 +02:00
marko@hundin.mysql.fi
cbae4a0a9b Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
2005-01-31 09:36:07 +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
kent@mysql.com
b0d2e3c9d9 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-30 00:32:14 +01:00
Sinisa@sinisa.nasamreza.org
14d887c423 Merge sinisa.nasamreza.org:/mnt/work/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/petica
2005-01-29 23:00:17 +02:00
Sinisa@sinisa.nasamreza.org
d8f467cfe8 Fix for a "table is full" bug in multi-table updates (Bug #7788) 2005-01-29 22:56:00 +02:00
dlenev@mysql.com
e5e792b2d1 Merge mysql.com:/home/dlenev/src/mysql-4.1-tzbug
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-29 20:06:58 +03:00
dlenev@mysql.com
0d32090bcb Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/dlenev/src/mysql-4.1-tzbug
2005-01-29 20:04:33 +03: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
reggie@bob.(none)
24716111c1 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1
into bob.(none):/home/reggie/bk/mysql41
2005-01-29 09:41:23 -06:00
reggie@bob.(none)
f953ef56f9 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0
into bob.(none):/home/reggie/bk/mysql5.0
2005-01-29 09:37:06 -06:00
reggie@bob.(none)
fc254d068f Merge 2005-01-29 09:34:36 -06:00
reggie@bob.(none)
9af0b70d9e Bug #5185 mysqldump for windows database gets table names with different case
mysqldump.c:
  Trimmed some lines to be less than 80 chars.  Using just NAME_LEN now for table name buffers
2005-01-29 09:25:56 -06:00
kent@mysql.com
57fce07b31 mysql-test-run.sh:
Old Solaris 'test' lack -e
2005-01-29 15:59:29 +01:00
kent@mysql.com
0b057dd6ee Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
2005-01-29 12:46:13 +01:00
sergefp@mysql.com
87f71d0557 Merge mysql.com:/home/psergey/mysql-4.1-look2
into mysql.com:/home/psergey/mysql-5.0-merge
2005-01-29 07:11:47 +03:00
sergefp@mysql.com
8fe7d199b6 Merging fix for BUG#7672 - the changes will not go into 4.1 2005-01-29 06:49:48 +03:00
jimw@mysql.com
691cd6c50d Fix error in string comparisons with CHAR(31) against the space-padding
of strings of unequal length. (Bug #8134)
2005-01-28 17:18:35 -08:00
jimw@mysql.com
f95f820727 Fix test results for mysqldump test. Part of Bug #8148. 2005-01-28 12:13:01 -08:00
jimw@mysql.com
71670605ac Use single quotes to set SQL_MODE in mysqldump output in case ANSI_QUOTES
was already defined on the server the dump is loaded into. (Bug #8148)
2005-01-28 11:16:49 -08:00
tulin@mysql.com
0c81869537 ndb_opt_defaults.h:
removed usage of SIGRTMIN temorarilly as it causes problems on some platforms
2005-01-28 19:28:14 +01:00
serg@serg.mylan
896e2747b7 there's no need to define UNIV_DEBUG explicitly anymore 2005-01-28 19:03:07 +01: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
f22a14acf1 Merge mysql.com:/home/dlenev/src/mysql-4.1-tzbug
into mysql.com:/home/dlenev/src/mysql-5.0-merges
2005-01-28 19:09:29 +03: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
serg@serg.mylan
6117ee754b fixed automake problem in dbug/Makefile.am 2005-01-28 13:49:42 +01: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
pekka@mysql.com
9182e52495 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/export/space/pekka/ndb/version/my50
2005-01-28 13:01:01 +01:00
tomas@poseidon.ndb.mysql.com
b313dee545 NdbScanFilter.hpp:
added docs
2005-01-28 13:01:00 +01: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