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
39915 commits 2774 branches 343 tags 1.6 GiB
Commit graph

14839 commits

Author SHA1 Message Date
msvensson@neptunus.(none)
899dca14ee Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-03 17:53:10 +01:00
msvensson@neptunus.(none)
63091e074a Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-03 16:18:32 +01:00
msvensson@neptunus.(none)
78af4ae44c Fix problem with mysql.test relying on "echo" behaviour 2006-11-03 16:09:16 +01:00
msvensson@neptunus.(none)
570f603988 Don't warn about "Found non pid file" for elements that are not files. 2006-11-03 15:26:42 +01:00
msvensson@neptunus.(none)
b850ae8a54 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-03 14:40:52 +01:00
msvensson@neptunus.(none)
795ad91bc3 Use lowercase for "Too long dbname" test as it will be put ot lower on some platforms and we don't wan't to test that. 2006-11-03 13:12:16 +01:00
msvensson@neptunus.(none)
7b4a8e41a6 Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well. 2006-11-03 12:32:05 +01:00
cmiller@zippy.cornsilk.net
b074e13483 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2006-11-02 17:51:59 -05:00
cmiller@zippy.cornsilk.net
af5acac047 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2006-11-02 17:39:52 -05:00
cmiller@zippy.cornsilk.net
c34f3219b3 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
 2006-11-02 17:27:42 -05:00
iggy@rolltop.ignatz42.dyndns.org
2704ba3675 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint
 2006-11-02 15:16:33 -05:00
iggy@rolltop.ignatz42.dyndns.org
deb03b93ec Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint
 2006-11-02 15:14:50 -05:00
iggy@rolltop.ignatz42.dyndns.org
cf65c157ee Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my51-mtr_vs_config
 2006-11-02 15:11:22 -05:00
iggy@rolltop.ignatz42.dyndns.org
9f329f2cf2 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my41-mtr_vs_config 
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mtr_vs_config/my50-mtr_vs_config
 2006-11-02 15:09:23 -05:00
iggy@rolltop.ignatz42.dyndns.org
39d7c5a6bc Bug#23865 mysql-test-run.pl on Windows only supports debug and release configurations 
Visual Studio builds each configuration in a different sub-directory.  Only the sub-
directories for release and debug are currently searched.
 2006-11-02 15:05:20 -05:00
thek@kpdesk.mysql.com
5f2424ead7 Merge kpdesk.mysql.com:/home/thek/dev/mysql-5.0-maint 
into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-maint
 2006-11-02 08:47:21 +01:00
kostja@bodhi.local
b2978f9ee8 A post-merge fix. 2006-11-02 08:58:51 +03:00
kostja@bodhi.local
965669d1f9 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-02 03:24:11 +03:00
kostja@bodhi.local
b471ea50f7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime-merge
 2006-11-02 01:21:37 +03:00
kostja@bodhi.local
6a28c436f7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into  bodhi.local:/opt/local/work/mysql-4.1-runtime
 2006-11-02 01:08:39 +03:00
msvensson@shellback.(none)
8d29d65cf3 Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-11-01 16:16:34 +01:00
joerg@trift2.
0d27df6f1a Merge trift2.:/MySQL/M51/clone-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2006-11-01 13:26:03 +01:00
msvensson@shellback.(none)
b9d4ccbf18 Merge shellback.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-31 19:08:30 +01:00
msvensson@shellback.(none)
2754edbaf3 Improve the reading of .pid files from var/run 
- Only read *.pid
 - Only allow it to contain a number
 2006-10-31 19:02:33 +01:00
msvensson@shellback.(none)
c6c0dcdc0d Remove warning, exe_mysql_fix_system_tables are not available on windows 2006-10-31 17:16:07 +01:00
jonas@perch.ndb.mysql.com
543e73d663 Merge perch.ndb.mysql.com:/home/jonas/src/50-multi 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-31 16:15:15 +01:00
jonas@perch.ndb.mysql.com
c6308d652d ndb - ndb_multi spurious failure 
remove timeing dependant part of test
 2006-10-31 16:09:31 +01:00
ramil/ram@mysql.com/myoffice.izhnet.ru
2d22e2ec84 Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint 
into  mysql.com:/usr/home/ram/work/bug23412/my41-bug23412
 2006-10-31 10:21:18 +04:00
msvensson@shellback.(none)
2fd830c4ea Merge bk-internal:/home/bk/mysql-4.1-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-4.1-maint
 2006-10-30 15:03:04 +01:00
msvensson@shellback.(none)
9f223873cf Bug#18654 Test is timing-dependent and fails from scheduling effects (?) 
- Wait in loop with small sleep until tables has been renamed
 2006-10-30 14:42:28 +01:00
msvensson@shellback.(none)
5a049ba807 Merge shellback.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-10-30 13:45:24 +01:00
msvensson@shellback.(none)
e8c7f19179 Improve comments around FLUSH STATUS 
It's not possible to flush the global status variables in 5.0
Update test case so it works by recording the value of handle_rollback
before and compare it to the value after
 2006-10-30 13:35:57 +01:00
jonas@perch.ndb.mysql.com
f6fcb302ab Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2006-10-28 00:01:24 +02:00
jonas@perch.ndb.mysql.com
b67e5b1131 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
 2006-10-27 23:59:04 +02:00
jonas@perch.ndb.mysql.com
dc2ca8ca10 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-ndb
 2006-10-27 23:56:51 +02:00
ramil/ram@mysql.com/myoffice.izhnet.ru
c6ee81f0ed Fix for bug #23412: delete rows with null date field 
Backport of the fix for bug #8143: A date with value 0 is treated as a NULL value
 2006-10-27 18:08:50 +05:00
kroki/tomash@moonlight.intranet
43e84da003 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug22584
 2006-10-27 13:47:45 +04:00
kroki/tomash@moonlight.intranet
db952c2faa Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug22584 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug22584
 2006-10-27 13:40:28 +04:00
kroki/tomash@moonlight.intranet
0e0f7a0423 BUG#22584: last_insert_id not updated after inserting a record through 
a updatable view.

When there's a VIEW on a base table that have AUTO_INCREMENT column, and
this VIEW doesn't provide an access such column, after INSERT to such
VIEW LAST_INSERT_ID() did not return the value just generated.

This behaviour is intended and correct, because if the VIEW doesn't list
some columns then these columns are effectively hidden from the user,
and so any side effects of inserting default values to them.

However, there was a bug that such statement inserting into a view would
reset LAST_INSERT_ID() instead of leaving it unchanged.

This patch restores the original value of LAST_INSERT_ID() instead of
resetting it to zero.
 2006-10-27 13:32:41 +04:00
msvensson@neptunus.(none)
4aa5a91b20 Merge bk-internal:/home/bk/mysql-5.1-new-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-27 00:00:00 +02:00
msvensson@neptunus.(none)
6e70b126ed Merge bk-internal:/home/bk/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-26 22:54:25 +02:00
msvensson@neptunus.(none)
7946e8c3c8 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-26 20:11:13 +02:00
msvensson@neptunus.(none)
74a29e5db4 Bug#20894 Reproducible MySQL client segmentation fault 
- Add two null bytes in  "buff" variable allowing us to call
   get_arg two times also for strings longer than sizeof(buff)
 2006-10-26 19:51:29 +02:00
msvensson@neptunus.(none)
a4d350e5ff Merge 192.168.0.4:mysql/my51-m-bug18888 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-26 19:15:47 +02:00
msvensson@shellback.(none)
631c82d2ea Bug#18888 Trying to overwrite sql/lex_hash.h during build 
- As a sideeffect of the patch to generate lex_hash.h only once
on the machine where the source dist was produced, a problem
was found when compiling a mysqld without partition support - it 
would crash when looking up the lex symbols due to mismatch between
lex.h and the generated lex_hash.h

 - Remove the ifdef for partition in lex.h 
 - Fix minor problem with"EXPLAIN PARTITION" when not compiled with
   partition(existed also without the above patch)
 - Add test case that will be run when we don't have partition
   support compiled into mysqld
 - Return error ER_FEATURE_DISABLED if user tries to use PARTITION
   when there is no support for it.
 2006-10-26 19:11:09 +02:00
tsmith/tim@siva.hindu.god
837fb44170 Merge siva.hindu.god:/usr/home/tim/m/bk/50 
into  siva.hindu.god:/usr/home/tim/m/bk/51
 2006-10-25 17:14:32 -06:00
tsmith/tim@siva.hindu.god
514fd098f2 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  siva.hindu.god:/usr/home/tim/m/bk/50
 2006-10-25 16:28:42 -06:00
kroki/tomash@moonlight.intranet
25501c38d3 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug18819
 2006-10-25 20:23:41 +04:00
kroki/tomash@moonlight.intranet
99baff565e Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug18819
 2006-10-25 20:16:39 +04:00
kroki/tomash@moonlight.intranet
fa60a03073 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-runtime 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug18819
 2006-10-25 20:13:07 +04:00