mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-31 02:51:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
13651 commits 2788 branches 343 tags 1.7 GiB
Commit graph

6763 commits

Author SHA1 Message Date
dlenev@brandersnatch.localdomain
f49d4f5350 Fix for bug #4508 "CONVERT_TZ() function with new time zone as param crashes server". 
Instead of trying to open time zone tables during calculation of CONVERT_TZ() function
or setting of @@time_zone variable we should open and lock them with the rest of 
statement's table (so we should add them to global table list) and after that use such 
pre-opened tables for loading info about time zones.
 2004-08-10 12:42:31 +04:00
dlenev@brandersnatch.localdomain
bcbbfc3bb8 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4756
 2004-08-10 03:07:07 +04:00
ingo@mysql.com
57e2f48b8b Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2004-08-09 19:10:54 +02:00
paul@kite-hub.kitebird.com
976e0ce3a8 mysqld.cc: 
minor option description change.
 2004-08-09 10:34:36 -05:00
ingo@mysql.com
41feaae09a Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2004-08-09 11:28:59 +02:00
ingo@mysql.com
82d54f6d86 bug#4369 - MySQL 4.1 regression in Alter table/tmp table from hash. 
Solved performance problems by fixing a typo, which prevented enabling of write buffer.
 2004-08-09 11:02:09 +02:00
paul@kite-hub.kitebird.com
651b6893b1 mysqld.cc: 
Put --help first, reorder other options so that they are
  alphabetical. (shouldn't have to use grep to find an option.)
  Move group_concat_max_len to variable part of list.
  Rename character_set_server, collation_server,
  shared_memory_base_name to character-set-server,
  collation-server, shared-memory-base-name.
  Make default-collation message refer to collation-server
  rather than character-set-server.
 2004-08-08 21:23:03 -05:00
kent@mysql.com
072818eab5 mysqld.cc: 
get_options() did an exit(0) after reporting "Too many arguments"
 2004-08-08 15:46:57 +02:00
serg@serg.mylan
e1e1c39bda cleanup 2004-08-07 23:18:13 +02:00
serg@serg.mylan
6e8503142e Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-07 18:28:10 +02:00
serg@serg.mylan
eaaedb69a8 bug#4881 - crash in ALTER .. RENAME if rename fails 2004-08-07 18:26:59 +02:00
dlenev@brandersnatch.localdomain
1902790634 Fix for bug #4756 "STR_TO_DATE() returning bad results with AM/PM". 
Added support of converion specifiers mentioned in manual but missing in code.
 2004-08-06 10:01:29 +04:00
konstantin@mysql.com
84de86c3f3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-root
 2004-08-05 14:19:18 -07:00
konstantin@mysql.com
403b91798a Cleanup in mysql_time.h/my_time.h headers. The first is used in mysql.h, 
the second is for the rest of time declarations in mysys.
 2004-08-05 14:16:43 -07:00
ndbdev@eel.hemma.oreland.se
8e74c1b78c Merge 2004-08-05 22:32:25 +02:00
ndbdev@eel.hemma.oreland.se
64618d7fe4 Merge joreland@bk-internal.mysql.com:irix 
into eel.hemma.oreland.se:/ndb/clone-mysql-4.1-ndb-daily-2004-08-04
 2004-08-05 22:19:52 +02:00
kent@mysql.com
48c8a11a4f mysqld.cc, mysql_test_run.c: 
Changed URL in error message, page has moved
 2004-08-05 17:05:21 +02:00
magnus@neptunus.(none)
d526f3277e BUG#4892 TRUNCATE TABLE returns error 156 
Added NDBCLUSTER to table types which does not support generate. 
Added test case for truncate.
 2004-08-04 11:28:36 +02:00
magnus@neptunus.(none)
1c65da2cbc BUG#4818 DELETE FROM tab LIMIT 
Check if there are any operations pending that needs to be taken over to the updating/deleting transaction before closing the scan
 2004-08-04 10:54:42 +02:00
joreland@mysql.com
20c86363f5 Merge 4.1 with jonas irix clone 2004-08-03 14:16:16 +02:00
mysqldev@o2k.irixworld.net
d861fa8577 Fix duplicate declaration in NDB cluster handler 2004-08-03 13:54:55 +02:00
serg@serg.mylan
dec992d8fb hang in dummy natural join (no common columns) Bug #4807 2004-08-02 11:12:11 +02:00
serg@serg.mylan
e8d23cfa26 followup to SET PASSWORD fix 2004-08-01 17:21:55 +02:00
serg@serg.mylan
c105f1ed8b Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-08-01 16:35:35 +02:00
serg@serg.mylan
2852862c68 apply in SET PASSWORD same checks as in GRANT, to let only valid hashes through 2004-07-30 22:05:08 +02:00
marko@hundin.mysql.fi
9edc3d8b9d ha_innodb.cc: 
ha_innobase::create(): pass the query string as UTF-8
  to row_table_add_foreign_constraints()  (Bug #4649)
 2004-07-30 16:08:19 +03:00
serg@serg.mylan
f66b4a1be4 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-07-30 14:25:18 +02:00
serg@serg.mylan
c5e2fbcc53 no_auto_value_on_zero + alter table bug 2004-07-30 14:17:12 +02:00
lenz@mysql.com
2cef6b922b Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/my/mysql-4.1
 2004-07-30 14:03:16 +02:00
lenz@mysql.com
453a079feb - added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql link 
flags to enable static linking (to avoid having a shared lib
   dependency in the Linux RPMs)
 - Disabled OpenSSL in the Max RPM
 2004-07-30 13:52:44 +02:00
jan@hundin.mysql.fi
e455748334 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-07-30 14:11:56 +03:00
serg@serg.mylan
9bbdb794f9 Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
 2004-07-30 09:50:37 +02:00
serg@serg.mylan
3a17ab4551 auto_value_on_zero bug test 2004-07-30 09:47:56 +02:00
dlenev@brandersnatch.localdomain
789037d901 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into brandersnatch.localdomain:/home/dlenev/src/mysql-4.1-bg4492
 2004-07-30 11:01:29 +04:00
jan@hundin.mysql.fi
b79d01d494 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-07-30 08:28:04 +03:00
guilhem@mysql.com
2b6151c20f Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 
into mysql.com:/home/mysql_src/mysql-4.1-1717
 2004-07-29 23:28:28 +02:00
guilhem@mysql.com
0f3e279a05 WL#1580: --start-datetime, --stop-datetime, --start-position (alias for --position) and --stop-position 
options for mysqlbinlog, with a test file.
This enables user to say "recover my database to how it was this morning at 10:30"
(mysqlbinlog "--stop-datetime=2003-07-29 10:30:00").
Using time functions into client/ made me move them out of sql/ into sql-common/.
+ (small) fix for BUG#4507 "mysqlbinlog --read-from-remote-server sometimes
cannot accept 2 binlogs" (that is, on command line).
 2004-07-29 23:25:58 +02:00
ingo@mysql.com
ec65f2b5a4 Merge mysql.com:/home/mydev/mysql-4.1 
into mysql.com:/home/mydev/mysql-4.1-4100
 2004-07-29 13:15:25 +02:00
pekka@mysql.com
8bd205c8e2 ha_ndbcluster.h, ha_ndbcluster.cc: 
compile fix for gcc-2.95
 2004-07-29 10:44:53 +02:00
ingo@mysql.com
fd1fad4371 Fixed a copy-and-paste error: mysql_create_frm() should have 
its own enter string.
 2004-07-29 10:33:33 +02:00
jan@hundin.mysql.fi
9d615368ac Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-07-29 09:04:50 +03:00
paul@kite-hub.kitebird.com
a3091294b4 Fix some variable misorderings. 2004-07-28 14:52:04 -05:00
dlenev@brandersnatch.localdomain
d39fe2623f Fix for bug #4492. 
TIMESTAMP columns should be unsigned to preserve compatibility with 4.0
(Or else InnoDB will return different internal TIMESTAMP values when user upgrades to 4.1).

Altough this fix will introduce problems with early 4.1 -> 4.1 upgrades (tables with 
TIMESTAMP field should be reloaded using mysqldump) it will allow easy 4.0 -> 4.1 
upgrade (which is more important since 4.1 is still beta).
 2004-07-28 10:49:21 +04:00
jan@hundin.mysql.fi
8be6dd7d70 Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-07-28 09:00:59 +03:00
konstantin@mysql.com
b14b00249f Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/kostja/mysql/mysql-4.1-zlib
 2004-07-27 10:05:56 -07:00
bar@mysql.com
fd8b3474b5 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/home/bar/mysql-4.1
 2004-07-27 18:46:58 +05:00
bar@mysql.com
7f58bb793e A small fix to understand 4.1.0 format. 2004-07-27 18:43:40 +05:00
jan@hundin.mysql.fi
9e3111486f Merge jlindstrom@build.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/jan/mysql-4.1
 2004-07-27 12:44:15 +03:00
mskold@mysql.com
894501a1c9 Merge mskold@build.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/test/mysql-4.1-ndb
 2004-07-27 09:59:26 +02:00
serg@serg.mylan
3de8784b17 safemalloc always resets the free'd memory, not only when PEDANTIC_SAFEMALLOC 2004-07-26 21:33:42 +02:00