mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
42565 commits 2785 branches 343 tags 1.6 GiB
Commit graph

42565 commits

This branch
This branch
All branches
Author SHA1 Message Date
istruewing@chilla.local
ed09987083 Merge chilla.local:/home/mydev/mysql-5.0-axmrg 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-01 19:41:04 +01:00
istruewing@chilla.local
5e5c1b761c Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-01 17:33:54 +01:00
istruewing@chilla.local
dae855c168 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-01 17:10:09 +01:00
istruewing@chilla.local
b0e8f2b534 Bug#25844: "make test" does not find mysql-test-run.pl 
Need to change directory before calling mysql-test-run.pl
 2007-02-01 15:59:51 +01:00
istruewing@chilla.local
33e1d1091a Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-01 15:51:25 +01:00
istruewing@chilla.local
54bf789a6d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
 2007-02-01 15:15:40 +01:00
gluh@mysql.com/eagle.(none)
010dc0b55c Valgrind error fixes 
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
 2007-02-01 18:00:24 +04:00
istruewing@chilla.local
1c34270464 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-01 10:19:22 +01:00
istruewing@chilla.local
a3705af35f Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-02-01 09:26:09 +01:00
istruewing@chilla.local
73e61944f7 Merge chilla.local:/home/mydev/mysql-4.0-axmrg 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-01 08:09:36 +01:00
istruewing@chilla.local
97cf413d55 Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-02-01 07:52:28 +01:00
brian@zim.(none)
acd1201504 Reworked a section of code that caused valgrind errors (and that partitioning was not happy about). 2007-01-31 20:13:17 -08:00
df@kahlann.erinye.com
9fe01abcca Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
 2007-01-31 18:54:15 +01:00
df@kahlann.erinye.com
beb265b2fe MTR_BUILD_THREAD=auto for test runs during RPM build 2007-01-31 18:18:44 +01:00
joerg@trift2.
f1289aa1d9 Merge trift2.:/MySQL/M50/bug23293-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-01-31 18:18:11 +01:00
joerg@trift2.
cd16ad87a2 Merge trift2.:/MySQL/M50/bug12676-5.0 
into  trift2.:/MySQL/M50/push-5.0
 2007-01-31 18:16:51 +01:00
svoj@june.mysql.com
b6f39522de Merge mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-engines 
into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.1-engines
 2007-01-31 18:57:54 +04:00
svoj@mysql.com/june.mysql.com
11322bfaf1 After merge fix (WL#3567). 2007-01-31 18:32:53 +04:00
joerg@trift2.
e56eb2288c Fix bug#23293 "readline detection broken on NetBSD": 
Its root cause is a difference between the "readline" and "libedit" (header files)
definitions of "rl_completion_entry_function", where the "libedit" one is wrong anyway:
This variable is used as a pointer to a function returning "char *",
but "libedit" declares it as returning "int" and then adds casts on usage.

Change it to "CPFunction *" and get rid of the casts.
 2007-01-31 15:25:56 +01:00
svoj@mysql.com/june.mysql.com
a28b2ca1eb Merge mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-engines
 2007-01-31 17:09:58 +04:00
svoj@mysql.com/june.mysql.com
a69107598e Merge mysql.com:/home/svoj/devel/bk/mysql-4.1-engines 
into  mysql.com:/home/svoj/devel/mysql/WL3567/mysql-4.1-engines
 2007-01-31 16:17:27 +04:00
svoj@mysql.com/june.mysql.com
a51aae601d WL#3567 - MERGE engine: a check for underlying table conformance 
When a merge table is opened compare column and key definition of
underlying tables against column and key definition of merge table.

If any of underlying tables have different column/key definition
refuse to open merge table.
 2007-01-31 16:15:20 +04:00
peterg/pgulutzan@linux.site
2b432c7a23 Changed comments before functions to Doxygen style. 2007-01-30 16:15:22 -07:00
kent@mysql.com/kent-amd64.(none)
e580bd6c6f gen_lex_hash.cc: 
If inserting a GPL header, include a complete one
Makefile.am, mysql.dsw, mysql.sln:
  Removed C version of mysql-test-run
mysql.spec.sh:
  Specify GPL license only in GPL sources
.del-my_manage.h:
  Delete: mysql-test/my_manage.h
mysql.spec.sh:
  Added GPL header
.del-mysql_test_run_new.c:
  Delete: mysql-test/mysql_test_run_new.c
.del-mysql_test_run_new.dsp:
  Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
.del-my_create_tables.c:
  Delete: mysql-test/my_create_tables.c
.del-mysql_test_run_new_ia64.dsp:
  Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
msql2mysql.sh:
  Use up-to-date GPL header
.del-mysql_test_run_new.vcproj:
  Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
.del-my_manage.c:
  Delete: mysql-test/my_manage.c
 2007-01-31 00:06:42 +01:00
jani/jamppa@production.mysql.com
0e9a64684d Merge bk://localhost:5559 
into  production.mysql.com:/usersnfs/jamppa/mysql-4.0
 2007-01-30 17:52:27 +01:00
jani@ua141d10.elisa.omakaista.fi
b3523e398c Cleanup of thread-type (linuxthread or NTPL) detection code 
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
 2007-01-30 18:52:26 +02:00
df@kahlann.erinye.com
95275e28f2 Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work 
into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-25530
 2007-01-30 13:57:36 +01:00
brian@zim.(none)
8ac1d06728 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/archive-newformat-5.1
 2007-01-29 13:19:51 -08:00
brian@zim.(none)
9fc89facca Extended mysqlslap.c for auto tests (see the comment on the mysqlslap.c file). I also fixed a bug where limit was not being reached. 2007-01-29 13:17:30 -08:00
istruewing@chilla.local
42bd03e254 Merge chilla.local:/home/mydev/mysql-4.1-axmrg 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
 2007-01-29 18:47:46 +01:00
istruewing@chilla.local
79e099e8a6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  chilla.local:/home/mydev/mysql-4.1-axmrg
 2007-01-29 17:20:18 +01:00
baker@bk-internal.mysql.com
bf7efc3ce3 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-01-28 00:48:11 +01:00
baker@bk-internal.mysql.com
b64060f70d Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-01-27 00:36:40 +01:00
brian@zim.(none)
08e93132c4 Two things: 
1) Two small windows cleanups for Archive.
2) Patch from Calvin for Falcon to be able to have its own I_S loaded. One example added for this, does hello world.
 2007-01-26 15:36:39 -08:00
brian@zim.(none)
8820333ec3 For performance reasons we remove the ability in unique indexes on autoincrements to remove the ability to insert key lower then the current autoincrement value. 2007-01-26 14:17:45 -08:00
brian@zim.(none)
24d9d866c2 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  zim.(none):/home/brian/mysql/archive-newformat-5.1
 2007-01-26 12:49:20 -08:00
brian@zim.(none)
6829b2a5a6 This fixes a bug in show create table displaying auto_increment field when it should not. 
It also refactors the test case for Archive (removed two bad tests).
 2007-01-26 11:15:16 -08:00
brian@zim.(none)
3cca6ad8c1 Fixed a warning. Added the -A option so that the autoincrement could be set outside of the file. 2007-01-26 10:17:53 -08:00
gluh@eagle.(none)
30d927dab9 Merge mysql.com:/home/gluh/MySQL/Merge/5.0 
into  mysql.com:/home/gluh/MySQL/Merge/5.1
 2007-01-26 16:46:40 +04:00
gluh@eagle.(none)
67db27537b Merge mysql.com:/home/gluh/MySQL/Merge/5.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.1
 2007-01-26 16:46:01 +04:00
gluh@mysql.com/eagle.(none)
45f61a06fb Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt 
into  mysql.com:/home/gluh/MySQL/Merge/5.0
 2007-01-26 16:36:50 +04:00
gluh@mysql.com/eagle.(none)
658777d808 Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt 
into  mysql.com:/home/gluh/MySQL/Merge/4.1
 2007-01-26 16:28:32 +04:00
baker@bk-internal.mysql.com
478ca800fd Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-01-26 03:43:41 +01:00
brian@zim.(none)
9d06ba72ea Made the example actually do something :) 
It now demonstrates creating its own thread and shows off how to clean up after itself (creates a really simple heartbeat file)
 2007-01-25 18:43:40 -08:00
dlenev@mockturtle.local
4fd3b03e71 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
 2007-01-25 21:55:44 +03:00
jani@ua141d10.elisa.omakaista.fi
0b4ee9e5b8 Cleanup of thread-type (linuxthread or NTPL) detection code 
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
 2007-01-25 20:10:31 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
70a74003fc Raise version number after cloning 5.1.15-beta 2007-01-25 18:19:49 +01:00
joerg@trift2.
32e83a6c3d For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide 
additional files that specify some actions which are allowed to the MySQL binaries.
    
Create a new subdirectory "supportfiles/RHEL4-SElinux" for them, and process it.

This fixes bug#12676.
 2007-01-25 17:51:21 +01:00
jani/jamppa@bk-internal.mysql.com
181865cac3 SETUP.sh: 
Don't use -Wshadow by default yet
 2007-01-25 13:12:02 +01:00
dlenev@mockturtle.local
631d3c9c1f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mockturtle.local:/home/dlenev/src/mysql-5.1-merge
 2007-01-25 14:58:45 +03:00