mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 06:44:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
18453 commits 2781 branches 343 tags 1.6 GiB
Commit graph

8629 commits

Author SHA1 Message Date
jimw@mysql.com
886b8603f4 Merge mysql.com:/home/jimw/my/mysql-4.1-9815 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-04-15 11:52:35 -07:00
serg@serg.mylan
08ae28f4b8 BUG#9922 - INSERT SELECT with UNIONs allows concurrent INSERTs 
don't set lex->lock_option=TL_READ in the parser for SELECT
 2005-04-15 19:20:15 +02:00
mskold@mysql.com
40a0548a1b Bug #9839 Column with AUTOINC contains -1 Value on node stop, post review fix 2005-04-15 16:14:08 +02:00
mskold@mysql.com
e889d234cb Bug #9839 Column with AUTOINC contains -1 Value on node stop 2005-04-15 15:52:07 +02:00
serg@serg.mylan
b07b5f7a6d Merge bk-internal:/home/bk/mysql-4.0/ 
into serg.mylan:/usr/home/serg/Abk/mysql-4.0
 2005-04-14 22:09:38 +02:00
serg@serg.mylan
4757803662 merged 2005-04-14 21:31:22 +02:00
serg@serg.mylan
533e0551f2 TRUNCATE is always a transaction on itself. pretent we're in auto-commit mode 
bug#8151
 2005-04-14 18:14:54 +02:00
jimw@mysql.com
6632ed5ce7 Check that the default storage engine is really available, and 
refuse to start up if it is not. (Bug #9815)
 2005-04-13 18:25:31 -07:00
jimw@mysql.com
47ab7c8785 Don't allow the server to start up when an invalid user is 
specified via --user or in configuration. (Bug #9833)
 2005-04-13 15:43:29 -07:00
heikki@hundin.mysql.fi
b698b8620e ha_innodb.cc: 
Fix part of bug #9670: if MySQL calls ::store_lock with TL_IGNORE, do not change prebuilt->select_lock_type; this fix may heal the assertion failures reported in UPDATE and multi-table UPDATE; it is not clear if this fixes the problems in OPTIMIZE TABLE
 2005-04-13 20:21:28 +03:00
mskold@mysql.com
e39ba63934 Merge 2005-04-13 14:08:54 +02:00
mskold@mysql.com
f5855f2d57 Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit 2005-04-13 12:42:23 +02:00
marko@hundin.mysql.fi
d5646eb6c5 InnoDB: Ignore character set mismatch in ALTER TABLE and RENAME TABLE 
if foreign_key_checks=0. (Bug #9802)
 2005-04-12 16:12:34 +03:00
gbichot@quadita2.mysql.com
f356fb08d6 In configure.in, don't remove $AVAILABLE_LANGUAGES_ERRORS_RULES at end 
because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).
 2005-04-11 17:37:49 +02:00
gbichot@quadita2.mysql.com
e42312c05d Merge gbichot@bk-internal.mysql.com://home/bk/mysql-4.1 
into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita
 2005-04-11 16:47:39 +02:00
gbichot@quadita2.mysql.com
c7c928f168 Fix for BUG#9149 "OPTIMIZE TABLE statement on InnoDB table is logged twice in the binary log" 
if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).
 2005-04-11 16:46:03 +02:00
reggie@mdk10.(none)
d07945c23b Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-4.1
 2005-04-11 09:19:49 -05:00
dlenev@brandersnatch.localdomain
831a612483 Merging fix for bug #9796 "Query Cache caches queries with CURRENT_USER() 
function" into 4.1 tree.
 2005-04-11 10:44:48 +04:00
dlenev@mysql.com
b0dd388190 Merge mysql.com:/home/dlenev/src/mysql-4.0-bg9796 
into mysql.com:/home/dlenev/src/mysql-4.1-merges
 2005-04-11 09:53:54 +04:00
dlenev@mysql.com
06e3647274 Fix for bug #9796 "Query Cache caches queries with CURRENT_USER() 
function".

We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.
 2005-04-11 00:30:23 +04:00
bar@mysql.com
16e186779f ctype_collate.result, ctype_collate.test, union.result, union.test: 
fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.
 2005-04-10 12:40:33 +05:00
acurtis@xiphis.org
aae638bbb2 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug6776.1
 2005-04-09 07:37:00 +01:00
acurtis@xiphis.org
0998ec4264 Fix typos in Bug#6776 2005-04-09 00:21:51 +01:00
acurtis@xiphis.org
e82edda6c6 Merge xiphis.org:/var/db/bk/work-acurtis/bug6776 
into xiphis.org:/var/db/bk/work-acurtis/bug6776.1
 2005-04-08 21:40:50 +01:00
reggie@mdk10.(none)
9506fb97b5 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mdk10.(none):/home/reggie/bk/mysql-4.1
 2005-04-08 14:17:29 -05:00
marko@hundin.mysql.fi
a0af6bb7f5 Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1 
into hundin.mysql.fi:/home/marko/mysql-4.1
 2005-04-08 22:17:28 +03:00
reggie@mdk10.(none)
3f5b8b976c Bug #9665 After registering MySQL service and starting with shared mem, cannot stop 
Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server
 2005-04-08 09:17:19 -05:00
reggie@mdk10.(none)
c55a7b651f Bug #9665 After registering MySQL service and starting with shared mem, cannot stop 
The shared memory connect event was not being set in kill_server.
This caused the thread that is handling shared memory connections to never
exit.
 2005-04-08 00:16:02 -05:00
msvensson@neptunus.(none)
960410274c Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-07 20:21:17 +02:00
mskold@mysql.com
b716302860 Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage, post review fix 2005-04-07 20:08:01 +02:00
mskold@mysql.com
b135b175fa Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
 2005-04-07 17:51:53 +02:00
mskold@mysql.com
89b140340c Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage 2005-04-07 17:44:09 +02:00
sergefp@mysql.com
3f6cdec788 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/psergey/mysql-4.1-bug8877
 2005-04-07 17:47:37 +04:00
sergefp@mysql.com
0cd5877b02 Post-review fixes: local variable renamed 2005-04-07 17:44:48 +04:00
marko@hundin.mysql.fi
b5328a7dbc InnoDB: Prevent ALTER TABLE ... ENGINE=... 
if there are foreign key constraints on the table. (Bug #5574)
 2005-04-07 12:16:41 +03:00
monty@mysql.com
174c15aee1 Small fixes done while reviewing pushed code 2005-04-06 16:52:41 +03:00
monty@mysql.com
b9fdb65b18 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/my/mysql-4.1
 2005-04-06 15:53:32 +03:00
monty@mysql.com
6483a71e82 Fixed that create_time is set properly for cached threads 2005-04-06 15:52:32 +03:00
gluh@mysql.com
85bf400612 Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
 2005-04-06 15:19:02 +05:00
bar@mysql.com
1c46a02069 Minor clean-ups for the previous commit. 2005-04-06 15:12:44 +05:00
gluh@mysql.com
decfc86fbb Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/gluh/MySQL/Bugs/mysql-4.1.9286
 2005-04-06 14:14:13 +05:00
gluh@eagle.intranet.mysql.r18.ru
6f18d7d26f Fix for bug #9286: SESSION/GLOBAL should be disallowed for user variables 2005-04-06 14:13:06 +05:00
msvensson@neptunus.(none)
9586a06f85 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-04-06 10:56:51 +02:00
bar@mysql.com
0134a2b286 Adding a new parameter for well_formed_length to 
return error. We'll use it for better warnign reporting.
 2005-04-06 11:53:15 +05:00
msvensson@neptunus.(none)
36120cd6af Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug6762
 2005-04-05 13:07:46 +02:00
msvensson@neptunus.(none)
f22b8930c3 Fix swedish error message 2005-04-05 13:01:16 +02:00
msvensson@neptunus.(none)
f8ae1e53c8 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug6762
 2005-04-05 11:23:17 +02:00
jimw@mysql.com
247f2ac563 Merge new tests 2005-04-04 18:29:18 -07:00
jimw@mysql.com
59b1a1f62f Merge mysql.com:/home/jimw/my/mysql-4.1-9472b 
into mysql.com:/home/jimw/my/mysql-4.1-clean
 2005-04-04 18:27:27 -07:00
sergefp@mysql.com
53e0b5b5db Removed extra comment 2005-04-05 03:34:39 +04:00