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

800 commits

Author SHA1 Message Date
knielsen@mysql.com
2ad568d421 Merge bk-internal:/home/bk/mysql-5.1-new 
into  mysql.com:/usr/local/mysql/mysql-5.1-relmerge
 2006-01-17 18:35:16 +01:00
knielsen@mysql.com
12cb3f4c5e Windows/Visual Studio 2003 fixes for the 5.1.5 release. 2006-01-13 22:09:48 +01:00
tomas@poseidon.ndb.mysql.com
4b731ddfb4 wl2325 wl2324 2006-01-12 19:51:02 +01:00
andrey@lmy004.
570db08105 WL #1034 (Internal CRON) post-push fixes. 
fix INSERT/REPLACE statements so test suite runs again.
The question is why we have 2 parallel universes - 2 different
ways to start the test suite, a shell and perl version. One more case
where redundancy makes life nightmare.
 2006-01-12 14:17:00 +01:00
andrey@lmy004.
9f82755b81 WL #1034 (Internal CRON) post-push fix 
- add Event_priv to db and host tables
 2006-01-12 12:06:13 +01:00
andrey@lmy004.
71eb7d7ec9 WL #1034 (Internal CRON) pre-push updates 
- various fixes of test cases
(hopefully the last pre-push update before the push)
 2006-01-11 18:09:05 +01:00
andrey@lmy004.
7c049782fa WL #1034 (Internal CRON) 
merge before push
 2006-01-10 21:02:19 +01:00
serg@serg.mylan
923e7cfd73 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into serg.mylan:/usr/home/serg/Abk/mysql-5.1
 2006-01-07 14:50:03 +01:00
serg@serg.mylan
8241a5a8e8 cleanup 2006-01-04 10:36:49 +01:00
joerg@mysql.com
2a29c32908 Test files in new subdirectory "mysql-test/extra" need to be propagated into binary distribution. 2006-01-03 14:36:31 +01:00
kent@mysql.com
2205d1b8d5 mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln: 
Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
  new file
 2005-12-19 01:12:11 +01:00
andrey@lmy004.
5ec6c5f2c6 WL #1034 update 
- varchar -> char
- transient_expression -> interval_value
- interval_type -> interval_field
 2005-12-16 13:01:46 +01:00
andrey@lmy004.
533180d76c WL#1034 update 
- fix EVENT_ACL problem that GRANT ALL on some_db.* to someone@somewhere did not get to mysql.db
- fix crash when the following is executed :
  CREATE EVENT P() CREATE EVENT E ON SCHEDULER 1 SECOND DO ROLLBACK;
  (creation works as well as calling P() which creates the event).
 2005-12-15 14:12:28 +01:00
andrey@lmy004.
fd0613f59e Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-wl1034 
into lmy004.:/work/mysql-5.1-tt-copy-works
 2005-12-14 12:15:48 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
7ded800078 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-12-13 19:46:35 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
13d7abe06f Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
 2005-12-13 18:44:20 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
32466b14fb Minor Netware specific changes. 2005-12-13 18:30:10 +02:00
kent@mysql.com
a6849a9238 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
 2005-12-12 16:12:36 +01:00
kent@mysql.com
cf57f12407 make_win_src_distribution.sh: 
Removed Visual Studio 6 project files, as they are not maintained
 2005-12-11 09:21:13 +01:00
andrey@lmy004.
7120d43c36 WL#1034 updated 
- split into several files
- forbid parallel execution (before analyse is done how to make it possible)
  because the same sp_head instance cannot be executed in parallel
- added GPL headers
- changed EVENT_ACL to be per DB variable
- fixed minor problems
 2005-12-05 11:45:04 +01:00
jimw@mysql.com
b3ba66495c Merge mysql.com:/home/jimw/my/mysql-5.0-clean 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
 2005-11-30 13:12:35 -08:00
jimw@mysql.com
085e7784b0 Merge mysql.com:/home/jimw/my/mysql-5.0-14610 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-30 13:10:50 -08:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265 Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
 2005-11-23 14:57:00 +02:00
joerg@mysql.com
3a7d81258c Merge mysql.com:/M51/mysql-5.1 into mysql.com:/M51/clone-5.1 2005-11-23 11:24:52 +01:00
kent@mysql.com
bcdd552d6e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
 2005-11-19 11:20:52 +01:00
kent@mysql.com
bd80dc6c2e Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-19 11:11:09 +01:00
guilhem@mysql.com
2f95fc2701 Merge mysql.com:/home/mysql_src/mysql-5.0 
into  mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
 2005-11-18 16:38:01 +01:00
joerg@mysql.com
ebb6552b1c scripts/make_binary_distribution.sh 
Adapt to the directory hierarchy change in 5.1, "ndb" -> "storage/ndb".
 2005-11-11 18:48:53 +01:00
jimw@mysql.com
bb742ae0fa Don't try to mysqlhotcopy the INFORMATION_SCHEMA database. (Bug #14610) 2005-11-10 17:05:36 -08:00
jimw@mysql.com
3506e1e58b Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-10 11:24:57 -08:00
jimw@mysql.com
56a56a789a Merge mysql.com:/home/jimw/my/mysql-4.1-14469 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-11-10 11:23:52 -08:00
svoj@poseidon.ndb.mysql.com
3791197f0d WL#2575 - Fulltext: Parser plugin for FTS 
WL#2763 - MySQL plugin interface: step 1
Manual merge from CNET tree.
 2005-11-06 13:13:06 +01:00
monty@mysql.com
a6f5375cb0 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2005-11-05 01:32:55 +02:00
kent@mysql.com
4742f585b1 Merge 2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
 2005-11-04 01:15:35 +01:00
jimw@mysql.com
bb34222087 Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-11-01 12:15:08 -08:00
jimw@mysql.com
6894cbc9eb Fix harmless typo in mysql_fix_privilege_tables.sql (Bug #14469) 2005-10-31 15:56:52 -08:00
jimw@mysql.com
1d9bfbf7d2 Handle decision to use mysqld-max over mysqld within mysqld_safe 
even when --ledir option is specified. (Bug #13774)
 2005-10-31 11:15:44 -08:00
kent@mysql.com
85ab53357b thread_registry.h, thread_registry.cc: 
Add explicit Thread_info::Thread_info() and move both
  initializers out of class definition, to solve link
  problem on QNX
Makefile.am:
  Preserve executable mode on scripts
make_binary_distribution.sh:
  Copy *.imtest files
 2005-10-16 06:49:19 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
63ac3040a8 Small fixes for Netware. 2005-10-14 08:45:41 +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
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
jani@ua141d10.elisa.omakaista.fi
5dad171618 Some Netware related fixes and fixes for Metrowerks compiler. 2005-10-13 17:21:14 +03: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
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
lenz@mysql.com
c0aa09884a Merge mysql.com:/space/my/mysql-4.1-build 
into mysql.com:/space/my/mysql-5.0-build
 2005-10-11 21:54:23 +02:00
lenz@mysql.com
9b4ab5931a Merge mysql.com:/space/my/mysql-4.0-build 
into mysql.com:/space/my/mysql-4.1-build
 2005-10-11 21:24:01 +02:00
lenz@mysql.com
8782f5a0e3 - added Docs/manual.chm to the windows source distribution (BUG#13899) 2005-10-11 21:16:08 +02:00
lars@mysql.com
57f36732ca Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1 
into  mysql.com:/users/lthalmann/bk/mysql-5.0
 2005-10-10 17:50:19 +02:00