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

41202 commits

This branch
This branch
All branches
Author SHA1 Message Date
msvensson@neptunus.(none)
1daff38fd8 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-30 11:31:51 +01:00
joerg@trift2.
645aa69dd3 Merge trift2.:/MySQL/M51/push-5.1 
into  trift2.:/MySQL/M51/bug24182-5.1
 2006-11-30 11:05:12 +01:00
joerg@trift2.
1801033139 support-files/mysql.spec.sh : Call "make install" using "benchdir_root=%{_datadir}" (bug#24182). 2006-11-30 11:03:49 +01:00
msvensson@neptunus.(none)
f883d68ad6 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-30 10:57:40 +01:00
msvensson@neptunus.(none)
a743e17d8c Add "chmod" command to mysqltest 2006-11-30 10:54:50 +01:00
joerg@trift2.
c680ab4100 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-30 10:38:54 +01:00
msvensson@neptunus.(none)
b9d696099a check_db_name know takes LEX_STRING* 2006-11-30 09:13:09 +01:00
bar@mysql.com/bar.intranet.mysql.r18.ru
dcde1be17d Bug#24158 SET PASSWORD in binary log fails under ANSI_QUOTES 
Problem: ``SET PASSWORD FOR foo@localhost'' was written into
binary log using double quites: ``SET PASSWORD FOR "foo"@"localhost"...''.
If sql_mode was set to ANSI_QUOTES, parser on slave considered
"foo" and "localhost" as identifiers instead of strigns constants,
so it failed to parse, generated syntax error and slave then stopped.
Fix: changing binary log entries to use single quotes:
``SET PASSWORD FOR 'foo'@'localhost'...'' not to depend on ANSI_QUOTES.
 2006-11-30 11:08:23 +04:00
monty@hasky.mysql.fi
5ec9d248de Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mysql.com:/home/my/mysql-5.1
 2006-11-30 04:18:55 +02:00
monty@mysql.com/narttu.mysql.fi
3a35c30027 Fixed compiler warnings (Mostly VC++): 
- Removed not used variables
- Changed some ulong parameters/variables to ulonglong (possible serious bug)
- Added casts to get rid of safe assignment from longlong to long (and similar)
- Added casts to function parameters
- Fixed signed/unsigned compares
- Added some constructores to structures
- Removed some not portable constructs

Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
(Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
 2006-11-30 03:40:42 +02:00
baker@bk-internal.mysql.com
082de8dfce Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-11-30 01:45:16 +01:00
kostja@bodhi.local
931cf68b59 A post-merge fix: fix the failing trigger-grant.test. 2006-11-30 03:34:10 +03:00
kostja@bodhi.local
bdf6d15f4b A post-merge fix. 2006-11-30 02:51:41 +03:00
kostja@bodhi.local
1cee31a6fd A post-merge fix. 2006-11-30 02:42:01 +03:00
kostja@bodhi.local
9fa2b75804 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-30 02:36:18 +03:00
kostja@bodhi.local
4d418e6c43 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-30 02:05:40 +03:00
kostja@bodhi.local
726c43cc00 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-30 02:04:43 +03:00
kostja@bodhi.local
605404ec68 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-30 02:00:39 +03:00
kostja@bodhi.local
c6c172e40c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2006-11-30 01:58:57 +03:00
msvensson@neptunus.(none)
b5603af7d5 Merge 192.168.0.5:mysql/mysql-5.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 23:53:07 +01:00
msvensson@neptunus.(none)
741eb0179a Update result to 5.1 version format 2006-11-29 23:48:39 +01:00
kostja@bodhi.local
74e3aa3143 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-30 01:40:49 +03:00
msvensson@neptunus.(none)
298edec4c1 Merge neptunus.(none):/home/msvensson/mysql/bug19731/my51-bug19731 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 23:09:57 +01:00
msvensson@neptunus.(none)
d3090cc3fe Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-29 23:08:35 +01:00
msvensson@neptunus.(none)
a50f80636c Merge neptunus.(none):/home/msvensson/mysql/bug19731/my50-bug19731 
into  neptunus.(none):/home/msvensson/mysql/bug19731/my51-bug19731
 2006-11-29 23:05:33 +01:00
msvensson@neptunus.(none)
68724b3a8d Bug#19371 VARBINARY() have trailing zeros after upgrade from 4.1 
- chmod the saved files from 4.1 to make sure they are writable
 2006-11-29 23:03:45 +01:00
msvensson@neptunus.(none)
db863d826c Add command "chmod" to mysqltest 2006-11-29 23:02:06 +01:00
msvensson@shellback.(none)
7146466eef Merge 192.168.0.10:mysql/work/my51-work 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
 2006-11-29 22:52:32 +01:00
msvensson@neptunus.(none)
eea2bd8421 Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-29 22:51:25 +01:00
msvensson@neptunus.(none)
21d6f823af Merge neptunus.(none):/home/msvensson/mysql/work/my50-work 
into  neptunus.(none):/home/msvensson/mysql/work/my51-work
 2006-11-29 22:50:54 +01:00
msvensson@neptunus.(none)
b23cb23349 Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-29 22:50:10 +01:00
msvensson@neptunus.(none)
9799bbd76f Merge neptunus.(none):/home/msvensson/mysql/work/my41-work 
into  neptunus.(none):/home/msvensson/mysql/work/my50-work
 2006-11-29 22:49:31 +01:00
msvensson@neptunus.(none)
5f4acf145b After 5.1.6 just turn on logging, it will be sent to tables by default 2006-11-29 22:49:02 +01:00
monty@narttu.mysql.fi
717284b85c Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-29 23:07:15 +02:00
monty@narttu.mysql.fi
2e8d2e3ef9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2006-11-29 22:54:11 +02:00
monty@mysql.com/narttu.mysql.fi
23263db66e Added back sql-bench directory, so that one can more easily run benchmarks on a server and add new benchmarks for new optimizations 
Fixed memory leak in _db_set() (Bug#24497 Valgrind warning: get_one_option)
Don't call net_clear() on COM_QUIT. This avoids a warning from net_clear() after shutdown: "skipped ## bytes from file"
BUG#21428: skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
 2006-11-29 22:51:09 +02:00
msvensson@neptunus.(none)
7aec43481d Change mode of the checked in 4.1 version files so they are writable 2006-11-29 21:38:38 +01:00
kostja@bodhi.local
966c569b94 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-29 23:36:26 +03:00
msvensson@shellback.(none)
f7bbcb71cc Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
 2006-11-29 21:31:05 +01:00
monty@mysql.com/narttu.mysql.fi
0bee93e038 Ignore some generated files 
Don't return from my_thread_global_end() until all threads have called my_thread_end()
Bug#24387: Valgrind: my_thread_init (handle_sl sql, handle_one_conn, handle_slave_io)
 2006-11-29 22:14:08 +02:00
kent@kent-amd64.(none)
4ed32e0448 Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 20:25:20 +01:00
kent@mysql.com/kent-amd64.(none)
cae575a390 Merge mysql.com:/home/kent/bk/mysql-4.1-build 
into  mysql.com:/home/kent/bk/mysql-5.0-build
 2006-11-29 20:24:41 +01:00
kent@mysql.com/kent-amd64.(none)
3643b3689f Makefile.am: 
Remove soft links before creating source TAR, to avoid file copies (bug#11865)
 2006-11-29 20:22:58 +01:00
kent@kent-amd64.(none)
e5ebcd1653 Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 19:42:19 +01:00
kent@mysql.com/kent-amd64.(none)
c048bf11ab Makefile.am: 
Corrected change to create "win" directory
 2006-11-29 19:41:48 +01:00
kent@kent-amd64.(none)
ffe9fcf123 Merge mysql.com:/home/kent/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/mysql-5.1-build
 2006-11-29 19:37:59 +01:00
kent@mysql.com/kent-amd64.(none)
43eba545f3 Makefile.am: 
"make distcheck" fix, "win" directory
 2006-11-29 19:35:40 +01:00
msvensson@shellback.(none)
521464755c Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-merge-from5.0-maint
 2006-11-29 19:32:36 +01:00
cmiller@zippy.cornsilk.net
42291995c3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-29 12:50:07 -05:00
cmiller@zippy.cornsilk.net
d577e3d4a8 Fix merges. 2006-11-29 12:49:21 -05:00