database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-12 10:22:39 +03:00
Code Activity
31,322 Commits 3,270 Branches 1,096 Tags
ff3a640e8f64b0fb25b51ea732b9f6c22f366bd2
Commit Graph

14773 Commits

Author SHA1 Message Date
igreenhoe/greenman@anubis.greendragongames.com
d97a344e7a Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  anubis.greendragongames.com:/home/greenman/workspace-mysql/mysql/mysql-5.0-maint
 2006-07-31 13:04:01 -07:00
msvensson@neptunus.(none)
d8a5ea2621 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-07-31 13:12:49 +02:00
msvensson@neptunus.(none)
a5112188e2 Fix lowercase_fs_off problem on windows. This test should not be run if lower_case_filesystem=OFF. 
By default lowercase_table_names are 1 on windows, and that makes the initialization of lower_case_filesystem variable to be skipped.
Add an else bracnh that does the initialization.
 2006-07-31 12:47:56 +02:00
igreenhoe/greenman@anubis.greendragongames.com
61a3a8e95c Fix for bug #16226 (timestamp_diff truncation issue when requesting 
difference between timestamp in values of months and quarters.)

Problem:  when requesting timestamp diff in months or quarters, it
would only examine the date (and not the time) for the comparison.

Solution:  increased precision of comparison.
 2006-07-28 20:51:17 -07:00
jimw@rama.(none)
e4d32625ca Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-19498
 2006-07-27 11:42:34 -07:00
msvensson@neptunus.(none)
119c5f2682 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-07-24 11:06:08 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a03dcf3f47 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/5.0.b8143
 2006-07-23 15:28:50 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
1c04310e30 Fix for bug #8143: A date with value 0 is treated as a NULL value 2006-07-23 15:25:30 +05:00
ramil/ram@mysql.com/myoffice.izhnet.ru
a810a2a437 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  mysql.com:/usr/home/ram/work/5.0.b10966
 2006-07-23 12:58:26 +05:00
msvensson@neptunus.(none)
d5eaa03ee4 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-07-20 17:38:09 +02:00
msvensson@neptunus.(none)
cb23cd759e Merge neptunus.(none):/home/msvensson/mysql/bug7498/my50-bug7498 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-07-20 13:41:50 +02:00
jimw@rama.(none)
d18eacc71d Bug #19498: Inconsistent support for DEFAULT in TEXT columns 
When a default of '' was specified for TEXT/BLOB columns, the specification
  was silently ignored. This is presumably to be nice to applications (or
  people) who generate their column definitions in a not-very-clever fashion.

  For clarity, doing this now results in a warning, or an error in strict
  mode.
 2006-07-18 16:04:18 -07:00
jimw@rama.(none)
0bdb8fcd0b Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-17903
 2006-07-18 10:58:44 -07:00
holyfoot/hf@mysql.com/deer.(none)
00f56da9af merging 2006-07-18 16:43:39 +05:00
msvensson@neptunus.(none)
2d43d0675e Bug#18539 uncompress(d) is null: impossible? 
- Add a check that length of field to uncompress is longer than 4 bytes.
   This can be dones as the length of uncompressed data is written as 
   first four bytes of field and thus it can't be valid compressed data.
 2006-07-18 12:41:41 +02:00
holyfoot/hf@mysql.com/deer.(none)
bed7b69243 Merge mysql.com:/home/hf/work/mysql-4.1.mrg 
into  mysql.com:/home/hf/work/mysql-5.0.mrg
 2006-07-18 14:52:29 +05:00
msvensson@neptunus.(none)
ec183566cc Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-07-18 09:50:46 +02:00
msvensson@neptunus.(none)
c83b9a5c1e Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-07-18 09:32:49 +02:00
jimw@rama.(none)
9f308f676a Merge bk-internal:/home/bk/mysql-5.0-maint 
into  rama.(none):/home/jimw/my/mysql-5.0-18539
 2006-07-17 12:21:30 -07:00
igreenhoe/greenman@anubis.greendragongames.com
b170112cae 4.1 -> 5.0 merge fixes 2006-07-14 05:56:30 -07:00
igreenhoe/greenman@anubis.greendragongames.com
abb75129f8 4.1 -> 5.0 merge 2006-07-13 16:35:25 -07:00
holyfoot/hf@mysql.com/deer.(none)
eddaafb12b Merge bk@192.168.21.1:mysql-4.1 
into  mysql.com:/home/hf/work/mysql-4.1.16017
 2006-07-13 22:32:18 +05:00
holyfoot/hf@mysql.com/deer.(none)
94ec899824 Merge bk@192.168.21.1:mysql-5.0-kt 
into  mysql.com:/home/hf/work/mysql-5.0.clean
 2006-07-13 14:25:58 +05:00
jimw@rama.(none)
30d7290c21 Bug #17903: cast to char results in binary 
The character set was not being properly initialized in CAST() with
  a type like "CHAR(2) BINARY", which resulted in incorrect results or
  even a crash.
 2006-07-12 13:22:38 -07:00
kostja@bodhi.local
bd183d42dc Fix a valgrind warning in type_date test. 2006-07-12 19:19:43 +04:00
mkindahl@dl145k.mysql.com
8e7754c9b2 Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-5.0 
into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-5.0-rpl
 2006-07-12 10:05:55 +02:00
mkindahl@dl145k.mysql.com
0f070b0b32 Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-4.1 
into  dl145k.mysql.com:/data0/mkindahl/bk/mysql-4.1-rpl
 2006-07-12 10:04:40 +02:00
cmiller@maint1.mysql.com
f83ad34329 Merge cmiller@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  maint1.mysql.com:/data/localhome/cmiller/mysql-4.1
 2006-07-12 05:34:56 +02:00
cmiller@zippy.(none)
f12bc24ac6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.(none):/home/cmiller/work/mysql/m41-maint--07AB5
 2006-07-11 14:25:42 -04:00
cmiller@zippy.(none)
22485908ce Bug#20729: Bad date_format() call makes mysql server crash 
The problem is that the author used the wrong function to send a warning to the 
user about truncation of data.  push_warning() takes a constant string and 
push_warning_printf() takes a format and variable arguments to fill it.

Since the string we were complaining about contains percent characters, the 
printf() code interprets the "%Y" et c. that the user sends.  That's wrong, and
often causes a crash, especially if the date mentions seconds, "%s".

A alternate fix would be to use  push_warning_printf(..., "%s", warn_buff) .
 2006-07-11 13:06:29 -04:00
kostja@bodhi.local
fbf54f8d72 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-11 17:04:27 +04:00
cmiller@zippy.(none)
faa575645f Merge zippy.(none):/home/cmiller/work/mysql/mysql-4.0__bug19006 
into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-4.1
 2006-07-11 07:24:59 -04:00
ingo/mydev@chilla.local
50b630ba7c Merge chilla.local:/home/mydev/mysql-5.0-release 
into  chilla.local:/home/mydev/mysql-5.0-amerge
 2006-07-11 13:01:27 +02:00
jimw@rama.(none)
9c18b5752c Bug #18539: uncompress(d) is null: impossible? 
The UNCOMPRESS() function was not marked as maybe_null, even though
  it returns NULL on invalid data. This confused the optimizer.
 2006-07-10 19:50:40 -07:00
kostja@bodhi.local
4f3636dd5a Fix yet another Windows build failure: "true" -> TRUE 2006-07-11 01:46:44 +04:00
kostja@bodhi.local
171bcbf339 Fix a Windows build failure. 2006-07-10 23:58:36 +04:00
ingo/mydev@chilla.local
dfaa3c78f6 Revoking patch for Bug#10952 on behalf of Brian. 2006-07-10 20:46:05 +02:00
guilhem@gbichot3.local
02c17dfb17 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl 
into  gbichot3.local:/home/mysql_src/mysql-5.0
 2006-07-10 17:06:19 +02:00
msvensson@neptunus.(none)
0efd88bd25 Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-07-10 12:48:09 +02:00
aelkin/elkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi
64d096f988 Merge dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/BARE/4.1 
into  dsl-hkigw8-feb1fb00-100.dhcp.inet.fi:/usr_rh9/home/elkin.rh9/MySQL/TEAM/FIXES/5.0/20919_temp_nlog
 2006-07-10 13:11:29 +03:00
aelkin/elkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi
fadbdf27c3 BUG#20919 temp tables closing fails when binlog is off 
closing temp tables through end_thread
had a flaw in binlog-off branch of close_temporary_tables where
next table to close was reset via table->next
 for (table= thd->temporary_tables; table; table= table->next)
which was wrong since the current table instance got destoyed at
	close_temporary(table, 1);

The fix adapts binlog-on branch method to engage the loop's internal 'next' variable which holds table->next prior table's destoying.
 2006-07-10 00:26:26 +03:00
kostja@bodhi.local
2ab1e065e4 Fix compiler warnings in sql_udf.h: ISO C++ forbids casting 
between pointer to function and pointer to object.
 2006-07-09 13:03:51 +04:00
kostja@bodhi.local
f1d949a856 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-08 21:45:02 +04:00
ingo/mydev@chilla.local
065cdb030a Merge chilla.local:/home/mydev/mysql-4.1-bug14400 
into  chilla.local:/home/mydev/mysql-4.1-amerge
 2006-07-08 19:25:01 +02:00
kostja@bodhi.local
ff1947da1e A post-merge fix. 2006-07-08 04:07:43 +04:00
kostja@bodhi.local
a2c0cdd75b Merge bodhi.local:/opt/local/work/tmp_merge 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
 2006-07-08 02:30:07 +04:00
kostja@bodhi.local
7bf73ac3e5 Merge bodhi.local:/opt/local/work/mysql-5.0-root 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-07-07 22:09:43 +04:00
bar@myoffice.izhnet.ru
eec0355de2 func_str.result, func_str.test: 
Adding test case.
item_strfunc.cc:
  bug#11728 string function LEFT, strange undocumented behaviour
  Fixing LEFT and RIGHT return NULL if the second
  argument is NULL.
 2006-07-07 17:06:30 +05:00
bar@mysql.com
2303077238 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b17647
 2006-07-07 12:17:00 +05:00
konstantin@bodhi.netgear
0db71aaf98 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.netgear:/opt/local/work/mysql-4.1-19399
 2006-07-07 00:01:05 +04:00