mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 04:53:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19688 commits 2784 branches 343 tags 1.6 GiB
Commit graph

9472 commits

Author SHA1 Message Date
gluh@gluh.mysql.r18.ru
34915f7a91 A fix: bug#6931: Date Type column problem when using UNION-Table 
bug#7833:  Wrong datatype of aggregate column is returned
 2005-02-04 15:31:36 +03:00
timour@mysql.com
e6150c7289 Merge mysql.com:/home/timka/mysql/src/4.1-dbg 
into mysql.com:/home/timka/mysql/src/4.1-bug-8023
 2005-02-04 11:58:59 +02:00
msvensson@neptunus.homeip.net
e54ea9189d Merge of query cache from 4.1 to 5.0 2005-02-04 10:56:53 +01:00
gluh@gluh.mysql.r18.ru
11435fdfad Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-04 12:37:18 +03:00
pekka@mysql.com
8e4fca2a55 Merge 2005-02-04 10:35:09 +01:00
sergefp@mysql.com
38339e1c51 Fix for BUG#7716: in in_string::set() take into account that the value returned 
by item->val_str() may be a substring of the passed string. 
Disallow string=its_substring assignment in String::operator=().
 2005-02-04 09:14:22 +03:00
jimw@mysql.com
f32c61fbaf Handle backslashes correctly in strings that also have doubled quotes when 
we are using the NO_BACKSLASH_ESCAPES SQL mode. (Bug #6368)
 2005-02-03 16:14:02 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
b823638f38 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug6726
 2005-02-03 23:14:47 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
d794406f64 Bug#6726 - failure to parse NOT BETWEEN 
Fix and test for parse bug
 2005-02-03 23:08:43 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
1cb1dcb0f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into pcgem.rdg.cyberkinetica.com:/var/db/bk/work-acurtis/bug8057
 2005-02-03 21:16:36 +00:00
acurtis@pcgem.rdg.cyberkinetica.com
b8ceaa4a1f Bug#8057 
Fix crash with LAST_INSERT_ID() in UPDATE,
  Tests included,
 2005-02-03 21:11:12 +00:00
guilhem@mysql.com
a85df46c01 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-02-03 18:55:29 +01:00
gluh@gluh.mysql.r18.ru
be5532d36a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-03 20:46:53 +03:00
monty@mysql.com
b233ddba8e After merge fixes 2005-02-03 18:00:50 +02:00
guilhem@mysql.com
ac053d80e9 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/mysql_src/mysql-5.0-clean
 2005-02-03 16:25:57 +01:00
guilhem@mysql.com
ed1696f6b9 WL#1062 "log charset info into all Query_log_event": 
we store 7 bytes (1 + 2*3) in every Query_log_event.
In the future if users want binlog optimized for small size and less safe,
we could add --binlog-no-charset (and binlog-no-sql-mode etc): charset info
is something by design optional (even if for now we don't offer possibility to disable it):
it's not a binlog format change.
We try to reduce the number of get_charset() calls in the slave SQL thread to a minimum
by caching the charset read from the previous event (which will often be equal to the one of the current event).
We don't use SET ONE_SHOT for charset-aware repl (we still do for timezones, will be fixed later).
No more errors if one changes the global value of charset vars on master or slave
(as we log charset info in all Query_log_event).
Not fixing Load_log_event as it will be rewritten soon by Dmitri.
Testing how mysqlbinlog behaves in rpl_charset.test.
mysqlbinlog needs to know where charset file is (to be able to convert a charset number found
in binlog (e.g. in User_var_log_event) to a charset name); mysql-test-run needs to pass
the correct value for this option to mysqlbinlog.
Many result udpates (adding charset info into every event shifts log_pos in SHOW BINLOG EVENTS).
Roughly the same job is to be done for timezones :)
 2005-02-03 16:22:16 +01:00
monty@mysql.com
43eb7cf303 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-03 16:50:06 +02:00
gluh@gluh.mysql.r18.ru
dd1dba19f0 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-03 17:33:57 +03:00
monty@mysql.com
422c2eb868 4.1 -> 5.0 merge 2005-02-03 13:18:30 +02:00
jan@hundin.mysql.fi
8fc13ecc97 Fixed a bug: deadlock without any locking, simple select and update (Bug #7975). 2005-02-03 10:54:38 +02:00
msvensson@neptunus.homeip.net
3181f5d2b6 Merged "query cache for ndb" to 5.0 2005-02-03 09:33:48 +01:00
gluh@gluh.mysql.r18.ru
cacb8d74b4 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-03 11:12:01 +03:00
monty@mysql.com
12bf600d18 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/my/mysql-5.0
 2005-02-02 22:41:18 +02:00
monty@mysql.com
209190d3df Review fixed 2005-02-02 22:39:21 +02:00
monty@mysql.com
e791e86444 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-02-02 20:30:57 +02:00
monty@mysql.com
3936edd7fa Fixed during review of new pulled code 2005-02-02 20:28:01 +02:00
jimw@mysql.com
5f0c4ff140 Merge fixes for #8248, #5569. 2005-02-02 08:21:11 -08:00
serg@serg.mylan
33fc4b10b6 configure.in 
don't define UNIV_DEBUG in CFLAGS/CXXFLAGS anymore
sql/mysqld.cc
    hide from the user options that do nothing
sql/sql_update.cc
    better fix for uninitialized used_index
 2005-02-02 12:08:20 +01:00
marko@hundin.mysql.fi
459fa7f1f9 After merge fixes 2005-02-02 11:50:27 +02:00
timour@mysql.com
2ad4cb38db Merge mysql.com:/home/timka/mysql/src/4.1-dbg 
into mysql.com:/home/timka/mysql/src/4.1-bug-8023
 2005-02-02 09:55:41 +02:00
igor@rurik.mysql.com
9a779d6441 Merge rurik.mysql.com:/home/igor/mysql-4.1 
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
 2005-02-01 23:54:39 -08:00
igor@rurik.mysql.com
0fb0dab4ca func_str.result, func_str.test: 
Added a test case for bug #7751.
item_strfunc.cc:
  Fixed bug #7751.
  The function Item_func_conv::val_str did not update
  the unsigned_flag value.
 2005-02-01 23:34:31 -08:00
timour@mysql.com
52e904c25c Fix for BUG#8023. 
Allow LIMIT clause after DUAL.
 2005-02-02 08:38:24 +02:00
jimw@mysql.com
e86457cef0 Fix QUOTE() to not reuse the input field for output, which resulted in 
incorrect results when the input was a constant across a multi-row SELECT
statement. (Bug #8248)
 2005-02-01 18:29:10 -08:00
acurtis@pcgem.rdg.cyberkinetica.com
a90d28eb6e Fix compile problem - line missing. 2005-02-01 23:43:09 +00:00
jimw@mysql.com
76ff72d73f Merge mysql.com:/home/jimw/my/mysql-4.0-5569 
into mysql.com:/home/jimw/my/mysql-4.0-clean
 2005-02-01 15:38:27 -08:00
jimw@mysql.com
891e8d076c Fix value of YEAR field when set from a non-numeric string. (Bug #6067) 2005-02-01 15:08:31 -08:00
heikki@hundin.mysql.fi
11c0260147 Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/heikki/mysql-4.1
 2005-02-02 00:22:19 +02: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
reggie@bob.(none)
b018755ea6 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into bob.(none):/home/reggie/bk/mysql41
 2005-02-01 08:46:56 -06:00
msvensson@neptunus.homeip.net
efd5ed2f9e WL#2269 Enable query cache for NDB 
- Added a thread that fetches commit_count for open tables. This
will mean that NDB will not have to be contacted for every use of a cached query.
 2005-02-01 15:43:08 +01:00
monty@mysql.com
0751cb8ff1 Remove #if 0 as this only confuses the code withing adding anything 2005-02-01 15:36:48 +02:00
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
gluh@gluh.mysql.r18.ru
92f04aedf3 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-02-01 12:20:03 +03: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
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
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
adb91423ac Bug#7011 
Merge from 4.1
 2005-01-31 15:57:32 +00:00
gluh@gluh.mysql.r18.ru
a899655e7a Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-31 17:13:03 +03:00
acurtis@pcgem.rdg.cyberkinetica.com
6a354b1b04 Bug#7011 
Merge from 4.0
 2005-01-31 12:48:00 +00:00
gluh@gluh.mysql.r18.ru
89ba364e03 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-31 13:36:05 +03: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
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
jimw@mysql.com
d1a2db170c Restore behavior of 4.1 that allowed any one argument to be passed to the 
server on Windows service startup, and not just --defaults-file=file. This
appears to be an unnecessary limitation, but fixing that will require
a larger refactoring of the Windows service installation and startup code.
(Bug #7856)
 2005-01-28 10:49:13 -08:00
gluh@gluh.mysql.r18.ru
526dbfda22 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-28 19:37:04 +03: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
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
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
gluh@gluh.mysql.r18.ru
6afbb3d627 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-27 20:01:37 +03: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
gluh@gluh.mysql.r18.ru
efeeb3c2e6 Fix after review for 
ChangeSet
  1.1803 05/01/24
  Additional fix for WL#1629: SHOW with WHERE(discussed with PeterG)
 2005-01-27 11:06:44 +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
gluh@gluh.mysql.r18.ru
a6315a8ad9 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0 
into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0
 2005-01-26 20:58:47 +03:00