database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-18 07:48:43 +03:00
Code Activity
28,672 Commits 3,279 Branches 1,097 Tags
a71de6bfe2022eb1a0c93c6078b0de9ed48b5c88
Commit Graph

9325 Commits

Author SHA1 Message Date
patg@krsna.patg.net
d86f40650f BUG# 13146 
Re-application of patch to clean 5.0 tree. Fixed issue with ANSI quotes 
when dumping triggers
 2005-10-13 13:42:56 -07:00
jimw@mysql.com
8ae2cfb0f7 Force a server restart for the not_embedded_server test to satisfy 
conditions of its first test. (Bug #13796)
 2005-10-13 11:10:45 -07:00
monty@mysql.com
6f5baa1eba Merge mysql.com:/home/my/mysql-4.1 
into  mysql.com:/home/my/mysql-5.0
 2005-10-13 20:18:37 +03:00
bar@mysql.com
fee9c13568 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-13 22:18:35 +05:00
jani@ua141d10.elisa.omakaista.fi
3ef920a7c7 Merged from 4.1. 2005-10-13 19:34:15 +03:00
bar@mysql.com
bf1a3bc030 select.result, mysqldump-max.result: 
after merge fix.
range.result:
  fixing result accordingly
  ,
cast.result:
  after merge fix
range.test:
  Avoid SELECT'ing of BINARY column not to output 0x00 bytes.
 2005-10-13 21:28:44 +05:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
 2005-10-13 18:23:53 +03:00
hf@deer.(none)
27d8bc5b1f merging 2005-10-13 19:51:07 +05:00
hf@deer.(none)
62ffbea5e4 merging 2005-10-13 19:31:09 +05:00
bar@mysql.com
fa0dec7531 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.char1
 2005-10-13 19:27:44 +05:00
bar@mysql.com
7c81d7fc69 ctype_utf8.result, ctype_utf8.test: 
New syntax: CHAR(x USING charset)
  Adding test case.
sql_yacc.yy:
  New syntax: CHAR(x USING charset)
  Adding new parser rule.
item_strfunc.h:
  New syntax: CHAR(x USING charset)
  Adding a new constructor.
 2005-10-13 19:24:47 +05:00
hf@deer.(none)
c933505d2d Fix for bug #3874 (Group by field is not considered) 2005-10-13 19:23:52 +05:00
bar@mysql.com
c229567887 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b9278
 2005-10-13 19:19:05 +05:00
bar@mysql.com
39b0712cf7 type_binary.result, type_binary.test: 
new file
mysql_fix_privilege_tables.sql, mysql_create_system_tables.sh:
  Adding true BINARY/VARBINARY: fixing "password" type, not to be 0x00-padding.
Many files:
  Adding true BINARY/VARBINARY: fixing tests not to output 0x00 bytes.
  Adding true BINARY/VARBINARY: new pad_char structure member.
ctype-bin.c:
  Adding true BINARY/VARBINARY: new pad_char structure member.
  New strnxfrm, with two trailing length bytes.
field.cc:
  Adding true BINARY/VARBINARY.
 2005-10-13 19:16:19 +05:00
msvensson@neptunus.(none)
1fc54b1045 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into  neptunus.(none):/home/msvensson/mysql/bug12698/my41-bug12698
 2005-10-13 15:53:02 +02:00
msvensson@neptunus.(none)
b81f3ef1ef Bug #12698 abnormal program termination running mysql_client_test 
- Move test for bug#93 from mysql_client_test.c to show_check.test
 - No need for test written in c
 2005-10-13 15:52:22 +02:00
evgen@moonbone.local
818c37ac68 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into moonbone.local:/work/13535-bug-4.1-mysql
 2005-10-13 17:17:32 +04:00
evgen@moonbone.local
fbd5140f2b Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into moonbone.local:/work/7672-bug-5.0-mysql
 2005-10-13 17:11:18 +04:00
kent@mysql.com
d0922679e0 Merge 2005-10-13 14:35:53 +02:00
kent@mysql.com
ab22636120 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-release 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
 2005-10-13 14:23:37 +02:00
evgen@moonbone.local
4d2a58f848 Manual merge of bug fix #7672 2005-10-13 16:00:26 +04:00
bar@mysql.com
ade90d49e5 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b12547
 2005-10-13 16:21:35 +05:00
konstantin@mysql.com
5269826383 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-12736
 2005-10-13 14:46:57 +04:00
kent@mysql.com
7743016908 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-13 12:38:38 +02:00
kent@mysql.com
2747a73857 Merge 2005-10-13 12:23:50 +02:00
kent@mysql.com
5b448a8d9f Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-tmp 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0
 2005-10-13 12:09:39 +02:00
msvensson@neptunus.(none)
cf987efb35 Updated after testing 2005-10-13 11:28:06 +02:00
elliot@mysql.com
a93780b23d BUG#13343 CREATE|etc TRIGGER|VIEW|USER don't commit the transaction (inconsistency) 
Updated more DDL statements to cause implicit commit.
 2005-10-13 05:12:17 -04:00
bar@mysql.com
ff3be543c9 Merge abarkov@bk-internal:/home/bk/mysql-5.0 
into  mysql.com:/usr/home/bar/mysql-5.0.b12547
 2005-10-13 14:07:41 +05:00
konstantin@mysql.com
f6899b0783 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/opt/local/work/mysql-5.0-12736
 2005-10-13 12:17:20 +04:00
tomas@poseidon.ndb.mysql.com
93d8c03d16 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
 2005-10-13 10:17:19 +02:00
konstantin@mysql.com
b2ff38202d A fix and a test case for Bug#12736 "Server crash during a select". 
The bug was in JOIN::join_free which was wrongly determining that
all joins have been already executed and therefore all used tables
can be closed.
 2005-10-13 11:53:00 +04:00
bar@mysql.com
85243ffd70 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/usr/home/bar/mysql-4.1.b12476
 2005-10-13 11:25:08 +05:00
patg@krsna.patg.net
a46dd41255 BUG# 13052 
Clean application of patch - 
- Added --tz-utc to fix issue of dumping timestamp values between 
servers with different global time zone settings, particularly 
with regard to the day of DST changeover, which without this fix,
 would dump duplicate timestamp values.
 2005-10-12 22:44:42 -07:00
jimw@mysql.com
701a137844 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 16:07:16 -07:00
guilhem@mysql.com
1a45a2bc6f Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-10-13 00:31:25 +02:00
guilhem@mysql.com
a6ceb59491 fixes after merge of 4.1. 2005-10-13 00:29:23 +02:00
jimw@mysql.com
f50e7466e3 Merge bk-internal:/home/bk/mysql-4.1 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 14:38:32 -07:00
guilhem@mysql.com
fb3506f370 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-10-12 23:36:41 +02:00
eric@mysql.com
06043b519a replace port number with string identifier so that it may have different ports and still run 
(problem found by kent)
 2005-10-12 14:33:08 -07:00
guilhem@mysql.com
8d900e90f0 Merge mysql.com:/home/mysql_src/mysql-4.1 
into  mysql.com:/home/mysql_src/mysql-5.0
 2005-10-12 23:33:07 +02:00
evgen@moonbone.local
fb0074a6ad Manual merged 2005-10-13 01:14:58 +04:00
dlenev@mysql.com
ad7705fac5 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/dlenev/src/mysql-5.0-repl
 2005-10-13 01:04:52 +04:00
evgen@moonbone.local
551961b207 select.test, sql_select.cc, sql_lex.cc, item.cc: 
Bug #7672 after merge fix
 2005-10-13 00:58:59 +04:00
kent@mysql.com
94ea4f188a make_binary_distribution.sh: 
Copy *.cnf files in mysql-test/std_data/
Makefile.am:
  Added std_data/*.cnf to copy ndb config
 2005-10-12 22:49:33 +02:00
jimw@mysql.com
041ae69093 Merge mysql.com:/home/jimw/my/mysql-4.1-12136 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:29:49 -07:00
guilhem@mysql.com
11848b53d3 To force a restart at the end of test, the option file must be non-empty, it's not enough if it exists and is empty. 2005-10-12 22:29:36 +02:00
jimw@mysql.com
cb0d8aba46 Merge mysql.com:/home/jimw/my/mysql-4.1-8731b 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:28:46 -07:00
jimw@mysql.com
626c8a1c8c Merge mysql.com:/home/jimw/my/mysql-4.1-13344 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:27:49 -07:00
jimw@mysql.com
6a19058c55 Merge mysql.com:/home/jimw/my/mysql-4.1-13619 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-10-12 13:26:49 -07:00