Commit graph

9664 commits

Author SHA1 Message Date
bell@laptop.sanja.is.com.ua
9b4018066e Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
2003-10-08 08:50:57 +03:00
bar@bar.mysql.r18.ru
c5c4e31545 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1
2003-10-08 10:19:25 +05:00
bar@bar.mysql.r18.ru
9023009ae3 query_cache.result, query_cache.test:
Character set variables test
2003-10-08 10:18:38 +05:00
greg@mysql.com
7a6239640f Fixed test case to work on NetWare. 2003-10-08 00:19:44 -04:00
bell@laptop.sanja.is.com.ua
1324a97f63 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-allany_aggregate-4.1
2003-10-07 21:01:57 +03:00
bell@laptop.sanja.is.com.ua
69c206915f Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-constructors-4.1
2003-10-07 19:20:51 +03:00
bell@laptop.sanja.is.com.ua
7921834334 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-constructors-4.1
2003-10-07 17:42:59 +03:00
bell@laptop.sanja.is.com.ua
e99441b045 after merge fix 2003-10-07 17:37:20 +03:00
heikki@hundin.mysql.fi
6112853cda Many files:
Multiple tablespaces for InnoDB
sql_table.cc:
  Tell explicitly that InnoDB should retrieve all columns in CHECKSUM TABLE
sql_update.cc, sql_select.cc, my_base.h:
  More descriptive flag name HA_EXTRA_RETRIEVE_ALL_COLS
2003-10-07 17:28:59 +03:00
bell@laptop.sanja.is.com.ua
862ff0ed1c fixed error detection 2003-10-07 16:26:46 +03:00
bell@laptop.sanja.is.com.ua
efae22f617 merge 2003-10-07 16:22:48 +03:00
bell@laptop.sanja.is.com.ua
09c139ac37 after merge fix 2003-10-07 13:31:44 +03:00
monty@narttu.mysql.fi
4b491cb788 Simple optimization 2003-10-07 13:26:56 +03:00
monty@narttu.mysql.fi
b31a79df3e merge 2003-10-07 11:24:38 +03:00
ram@gw.mysql.r18.ru
cb334d03f4 WL #562: Change format of slow log in 4.1 2003-10-07 12:05:35 +05:00
bell@laptop.sanja.is.com.ua
d5a7a6ec34 merge 2003-10-07 08:51:09 +03:00
bell@laptop.sanja.is.com.ua
dfb7ca08dc merge 2003-10-07 07:51:14 +03:00
bell@laptop.sanja.is.com.ua
5b13ec47dd Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
2003-10-07 02:20:23 +03:00
monty@narttu.mysql.fi
73cb1a52d2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-10-07 01:59:14 +03:00
bell@laptop.sanja.is.com.ua
18bb43671d Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-all_any_group-4.1
2003-10-07 01:31:16 +03:00
bell@laptop.sanja.is.com.ua
ccaeb61f8b after merge fix 2003-10-07 01:28:15 +03:00
monty@narttu.mysql.fi
8c0b7d5d97 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-10-07 00:34:43 +03:00
monty@mishka.mysql.fi
53fa223ed6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.mysql.fi:/home/my/mysql-4.1
2003-10-06 22:57:04 +03:00
monty@mishka.mysql.fi
a5c83b05bd Move init_compiled_charsets to own file
Remove dependency of charsets (in my_init) to get smaller binaries when charsets are not used
Simple code cleanup
2003-10-06 22:56:34 +03:00
bell@laptop.sanja.is.com.ua
0aa70f8115 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1
2003-10-06 22:38:51 +03:00
bell@laptop.sanja.is.com.ua
e527f268d5 fixed error names 2003-10-06 22:35:05 +03:00
bell@laptop.sanja.is.com.ua
e1b53fdd42 Merge 2003-10-06 20:55:06 +03:00
monty@narttu.mysql.fi
7d6f7d79e2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
2003-10-06 20:23:14 +03:00
hf@deer.(none)
ce6f77a9c5 Fix for #1447 2003-10-06 18:01:11 +05:00
hf@deer.(none)
6b0112549e Fix for #1488 2003-10-06 17:06:05 +05:00
hf@deer.(none)
8980fe218b Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-10-06 16:33:07 +05:00
hf@deer.(none)
a5f9c695df Fix for #1487 2003-10-06 16:32:38 +05:00
bell@laptop.sanja.is.com.ua
ba26a1aa64 fix error messages
fix derived inside subqueries
2003-10-06 13:16:56 +03:00
bell@laptop.sanja.is.com.ua
179acaa37e Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-derived-4.1
2003-10-06 12:04:08 +03:00
hf@deer.(none)
4661bd8498 Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-10-06 12:10:18 +05:00
hf@deer.(none)
f576380bc6 Fix for #1470 2003-10-06 12:09:20 +05:00
bell@laptop.sanja.is.com.ua
2103aae552 Merge laptop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into laptop.sanja.is.com.ua:/home/bell/mysql/bk/work-errs-4.1
2003-10-05 21:13:54 +03:00
bell@laptop.sanja.is.com.ua
16733e423e prohibited using derived tables in UPDATE command (BUG#1477)
fixed incorrect table name in test
2003-10-05 21:09:50 +03:00
hf@deer.(none)
4ef1e3635d Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.stmt
2003-10-04 19:28:50 +05:00
hf@deer.(none)
8bc13b1874 Fix for bugs #1437, #1446 2003-10-04 19:28:08 +05:00
bell@laptop.sanja.is.com.ua
a807e6d7d0 fixed error message as suggested by Peter Gulutzan 2003-10-04 13:46:23 +03:00
guilhem@mysql.com
e2ad218dd1 Merge gbichot@213.136.52.20:/home/bk/mysql-4.1
into mysql.com:/home/mysql_src/mysql-4.1
2003-10-03 23:23:59 +02:00
vva@eagle.mysql.r18.ru
a4c0d4dc84 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1
2003-10-03 17:23:58 -04:00
vva@eagle.mysql.r18.ru
c56fbbc3b4 Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1
2003-10-03 17:22:47 -04:00
vva@eagle.mysql.r18.ru
5df8184827 fixed bug with Item_sum_min/Item_sum_max from test func_gconcat.test 2003-10-03 17:22:17 -04:00
guilhem@gbichot2
5e55c4b809 editing comments. 2003-10-03 22:14:23 +02:00
guilhem@gbichot2
6bbf52d2ac Fix for a rpl_relayrotate failure.
Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.
2003-10-03 20:07:08 +02:00
bar@bar.mysql.r18.ru
67347790de sql_cache.cc, mysql_priv.h:
Query cache now takes in account character_set_results and collation_connection
2003-10-03 17:09:54 +05:00
monty@mishka.mysql.fi
0d21572d01 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mishka.mysql.fi:/home/my/mysql-4.1
2003-10-03 02:08:49 +03:00
greg@mysql.com
89fd19f430 Changes in NetWare directory from Novell, pre-4.1.1 2003-10-02 19:08:48 -04:00