database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-30 04:26:45 +03:00
Code Activity
71,796 Commits 3,247 Branches 1,092 Tags
d18f67bbab25cb15b0ca2b91693a7e134ac0cbb4
Commit Graph

940 Commits

Author SHA1 Message Date
pgalbraith@bk-internal.mysql.com
23f0c6d765 Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2006-12-09 02:34:42 +01:00
msvensson@neptunus.(none)
128b73fc36 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-12-04 19:28:38 +01:00
msvensson@neptunus.(none)
971c783f7d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-12-04 19:11:55 +01:00
brian@zim.(none)
31d67280f7 This finishes the work (someone) started to remove FIELD_ types and use the Enum MYSQL types. The second part to this is to actually deprecate the FIELD defines in mysql_com.h 2006-12-01 17:26:52 -08:00
kostja@bodhi.local
88dadbbf60 Merge bodhi.local:/opt/local/work/mysql-5.0-4968 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2006-12-01 13:26:49 +03:00
kostja@bodhi.local
87a87bc04b A fix and a test case for Bug#24179 "select b into $var" fails with 
--cursor_protocol": fix a misleading error message in case of
SELECT .. INTO.
 2006-12-01 13:25:06 +03:00
msvensson@shellback.(none)
7ddc43e305 Merge shellback.(none):/home/msvensson/mysql/mysql-5.1 
into  shellback.(none):/home/msvensson/mysql/mysql-5.1-maint
 2006-11-29 15:44:09 +01:00
kostja@bodhi.local
2525e16c73 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
 2006-11-29 11:44:37 +03:00
kostja@bodhi.local
5fea0724bc Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  bodhi.local:/opt/local/work/mysql-5.0-runtime
 2006-11-29 02:44:12 +03:00
msvensson@neptunus.(none)
04d5a42bbf Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-11-28 20:59:57 +01:00
monty@nosik.monty.fi
313f23a93a Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  mysql.com:/home/my/mysql-5.1
 2006-11-27 14:07:52 +02:00
kroki/tomash@moonlight.intranet
160f28084e After merge fixes: remove const and add query buffer. 2006-11-22 16:51:20 +03:00
kroki/tomash@moonlight.intranet
3b9a8532f5 After merge fixes: remove const and add query buffer. 2006-11-22 16:49:32 +03:00
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
 2006-11-22 14:11:36 +02:00
kroki/tomash@moonlight.intranet
b290ed7a97 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21635
 2006-11-22 14:17:24 +03:00
kroki/tomash@moonlight.intranet
7cb5df1ce0 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21635 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug21635
 2006-11-22 14:08:43 +03:00
kroki/tomash@moonlight.intranet
003cd7b78f Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21635 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug21635
 2006-11-22 14:05:26 +03:00
kroki/tomash@moonlight.intranet
ec7a6d15fc BUG#21635: MYSQL_FIELD struct's member strings seem to misbehave for 
expression cols.

The problem was that MYSQL_FIELD::org_name was set for MIN() and MAX()
functions (COUNT() is also mentioned in the bug report but was already
fixed).

After this patch for expressions MYSQL_FIELD::name is set to either
expression itself or its alias, and other data origin fields of
MYSQL_FILED (db, org_table, table, org_name) are empty strings.
 2006-11-22 13:58:00 +03:00
monty@mysql.com/nosik.monty.fi
e825879800 Remove compiler warnings 
(Mostly in DBUG_PRINT() and unused arguments)
Fixed bug in query cache when used with traceing (--with-debug)
Fixed memory leak in mysqldump
Removed warnings from mysqltest scripts (replaced -- with #)
 2006-11-20 22:42:06 +02:00
kroki/tomash@moonlight.intranet
1f699a4422 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug23383
 2006-11-17 12:33:59 +03:00
kroki/tomash@moonlight.intranet
6d4558f7c3 Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug23383
 2006-11-17 12:30:26 +03:00
kroki/tomash@moonlight.intranet
5e2ef3a68e BUG#23383: mysql_affected_rows() returns different values than 
mysql_stmt_affected_rows()

The problem was that affected_rows for prepared statement wasn't updated
in the client library on the error.  The solution is to always update
affected_rows, which will be equal to -1 on the error.
 2006-11-17 12:21:32 +03:00
jani@ua141d10.elisa.omakaista.fi
596f64d91a Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-lex-string
 2006-11-16 14:38:45 +02:00
msvensson@neptunus.(none)
430b493806 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-11-13 18:02:09 +01:00
msvensson@neptunus.(none)
bf020e5ea6 Bug#19817 error when try to compile PHP5.1 with mysql 5.0.21 static libs 
- Most likely caused by linking with libmysqlclient using gcc and not g++.
 - Removing our "yassl_dummy_link_fix" hacks so some test programs are linked
   with gcc 
 - Remove build of non working test programs in vio
 2006-11-13 17:16:37 +01:00
anozdrin/alik@alik.
ee15c11b7c Merge alik.:/mnt/raid/alik/MySQL/devel/5.1 
into  alik.:/mnt/raid/alik/MySQL/devel/5.1-rt-merged-2
 2006-11-07 16:24:35 +03: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
malff/marcsql@weblab.(none)
62c242cc75 Bug#21114 (Foreign key creation fails to table with name format) 
Due to the complexity of this change, everything is documented in WL#3565

This patch is the third iteration, it takes into account the comments
received to date.
 2006-11-02 11:01:53 -07:00
msvensson@neptunus.(none)
4d8eda1303 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-25 16:27:36 +02:00
msvensson@neptunus.(none)
eab6dbceab Fix memory leaks found when valgrinding mysql_client_test 
Remove one warning
 2006-10-25 16:26:57 +02:00
msvensson@neptunus.(none)
a6d87b4c00 Add valgrinding support for mysql_client_test 
Fix two memory leaks in mysql_client_test
 2006-10-25 14:34:18 +02:00
msvensson@neptunus.(none)
00c2535bbd Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 19:16:45 +02:00
msvensson@neptunus.(none)
28ca3dea79 Bug#23037 Bug in field "Default" of query "SHOW COLUMNS FROM table" 
- Fix check in mysql_client_test to reflect the change of datatype
   for DEFAULT column
 2006-10-24 19:16:18 +02:00
msvensson@neptunus.(none)
52aaf251bd Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-24 18:52:01 +02:00
msvensson@neptunus.(none)
a45e6ba7e8 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-24 18:51:07 +02:00
msvensson@neptunus.(none)
a8d1c62e5f Run mysql_client_test without --silent 
Flush both stdout and stderr before abort'ing mysql_client_test
 2006-10-24 18:49:19 +02:00
msvensson@neptunus.(none)
9069a9367b Merge neptunus.(none):/home/msvensson/mysql/bug17039/my51-bug17039 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
 2006-10-19 00:11:13 +02:00
msvensson@neptunus.(none)
4cf0a5ee74 Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-10-19 00:10:36 +02:00
msvensson@neptunus.(none)
658623bd5c Merge neptunus.(none):/home/msvensson/mysql/bug17039/my50-bug17039 
into  neptunus.(none):/home/msvensson/mysql/bug17039/my51-bug17039
 2006-10-18 22:58:04 +02:00
jani@ua141d10.elisa.omakaista.fi
8dd0b2d0ae Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-lex-string
 2006-10-17 19:54:44 +03:00
jani@ua141d10.elisa.omakaista.fi
02f29377fd Changed several char* to LEX_STRING*. 2006-10-16 19:57:33 +03:00
kroki/tomash@moonlight.intranet
ee0cebf9a7 BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID. 
Note: bug#21726 does not directly apply to 4.1, as it doesn't have stored
procedures.  However, 4.1 had some bugs that were fixed in 5.0 by the
patch for bug#21726, and this patch is a backport of those fixes.
Namely, in 4.1 it fixes:

  - LAST_INSERT_ID(expr) didn't return value of expr (4.1 specific).

  - LAST_INSERT_ID() could return the value generated by current
    statement if the call happens after the generation, like in

      CREATE TABLE t1 (i INT AUTO_INCREMENT PRIMARY KEY, j INT);
      INSERT INTO t1 VALUES (NULL, 0), (NULL, LAST_INSERT_ID());

  - Redundant binary log LAST_INSERT_ID_EVENTs could be generated.
 2006-10-06 13:34:07 +04:00
kroki/tomash@moonlight.intranet
8aa33bf46d Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726 
into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-real-bug21726
 2006-10-02 15:01:19 +04:00
kroki/tomash@moonlight.intranet
5ea8adfae7 BUG#21726: Incorrect result with multiple invocations of LAST_INSERT_ID 
Non-upper-level INSERTs (the ones in the body of stored procedure,
stored function, or trigger) into a table that have AUTO_INCREMENT
column didn't affected the result of LAST_INSERT_ID() on this level.

The problem was introduced with the fix of bug 6880, which in turn was
introduced with the fix of bug 3117, where current insert_id value was
remembered on the first call to LAST_INSERT_ID() (bug 3117) and was
returned from that function until it was reset before the next
_upper-level_ statement (bug 6880).

The fix for bug#21726 brings back the behaviour of version 4.0, and
implements the following: remember insert_id value at the beginning
of the statement or expression (which at that point equals to
the first insert_id value generated by the previous statement), and
return that remembered value from LAST_INSERT_ID() or @@LAST_INSERT_ID.

Thus, the value returned by LAST_INSERT_ID() is not affected by values
generated by current statement, nor by LAST_INSERT_ID(expr) calls in
this statement.

Version 5.1 does not have this bug (it was fixed by WL 3146).
 2006-10-02 14:28:23 +04:00
msvensson@shellback.(none)
2c3015499d Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 
into  shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
 2006-09-15 16:42:27 +02:00
msvensson@shellback.(none)
211aceca68 Merge shellback.(none):/home/msvensson/mysql/bug22139/my50-bug22139 
into  shellback.(none):/home/msvensson/mysql/bug22139/my51-bug22139
 2006-09-15 16:41:50 +02:00
msvensson@shellback.(none)
e890eed69b Bug#22139 undefined reference to `my_memmem' when compiling tests/mysql_client_test 
- Build mysql_client_test from mysql_client_test.c and mysys/my_memmem.c
 2006-09-12 11:34:46 +02:00
msvensson@neptunus.(none)
3a1e9009a2 Bug#17039 Cursor with procedure crashes client 
- Change 'get_unit_column_type" to return the field list for the procedure
 2006-09-07 16:44:18 +02:00
grichter@bk-internal.mysql.com
6993e3a3f7 Merge bk-internal.mysql.com:/data0/bk/mysql-5.0 
into  bk-internal.mysql.com:/data0/bk/mysql-5.0-cmake
 2006-09-02 11:03:16 +02:00
georg@lmy002.wdf.sap.corp
9d6471c33e make dist changes for Cmake build 2006-09-01 10:32:12 +02:00