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

2744 commits

Author SHA1 Message Date
monty@narttu.mysql.fi
5dcb64882d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-10-01 15:33:21 +03:00
monty@mysql.com/narttu.mysql.fi
315acca125 Removed extra spaces 
Added extra debug
 2007-10-01 15:32:07 +03:00
gshchepa/uchum@gleb.loc
bd4fd0473c Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-13 00:44:50 +05:00
gshchepa/uchum@gleb.loc
1926819d5b Merge gleb.loc:/home/uchum/work/bk/5.1 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-06 22:31:25 +05:00
malff@omega.weblab
d55b2bd13b Merge omega.weblab:/home/malff/TREE/mysql-5.1-base 
into  omega.weblab:/home/malff/TREE/mysql-5.1-rt-merge
 2007-09-05 14:52:40 -06:00
gshchepa/uchum@gleb.loc
582b69686c Merge gleb.loc:/home/uchum/work/bk/5.1-opt-29938 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-09-05 11:43:40 +05:00
gshchepa/uchum@gleb.loc
adfbea368d Fixed bug #29938. 
mysqldump --skip-events --all-databases dumped data of the mysqld.event table,
and during the restoration from this dump events were created in spite
of the --skip-events option.

The mysqldump client has been modified to ignore mysql.event table data
in case of --skip-events options.
 2007-09-05 11:35:29 +05:00
brian@zim.(none)
e235ccd13a Discovered a bug while working with backup. Since it is possible to execute a statement in a pre/post statment clause that can return a result, we need to test for that and free it. 2007-09-04 20:03:12 -07:00
malff/marcsql@weblab.(none)
0f58ed7e74 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
 2007-09-04 12:25:54 -06:00
gshchepa/uchum@gleb.loc
a6d644e7b5 Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30126 
into  gleb.loc:/home/uchum/work/bk/5.1-opt
 2007-08-31 17:50:52 +05:00
gshchepa/uchum@gleb.loc
3e49bbd8e7 Fixed bug #30126. 
When dumping database from a 4.x server, the mysqldump client
inserted a delimiter sign inside special commentaries of the form:
  /*!... CREATE DATABASE IF NOT EXISTS ... ;*/
During restoration that dump file was splitten by delimiter signs on
the client side, and the rest of some commentary strings was prepended
to following statements.

The 4x_server_emul test case option has been added for use with the
DBUG_EXECUTE_IF debugging macro. This option affects debug server
builds only to emulate particular behavior of a 4.x server for
the mysqldump client testing. Non-debugging builds are not affected.
 2007-08-31 16:59:07 +05:00
malff/marcsql@weblab.(none)
2482c59740 Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base 
into  weblab.(none):/home/marcsql/TREE/mysql-5.1-rt50-merge
 2007-08-30 13:23:59 -06:00
kaa@polly.(none)
e79902aa5c Merge polly.(none):/home/kaa/src/bug30164/my50-bug30164 
into  polly.(none):/home/kaa/src/bug30164/my51-bug30164
 2007-08-30 12:55:29 +04:00
kaa@polly.(none)
2bb849644b Bug #30164: Using client side macro inside server side comments generates broken queries 
Problem:
  
In cases when a client-side macro appears inside a server-side comment, the add_line() function in mysql.cc discarded all characters until the next delimiter to remove macro arguments from the query string. This resulted in broken queries being sent to the server when the next delimiter character appeared past the comment's boundaries, because the comment closing sequence ('*/') was discarded.
  
Fix:
  
If a client-side macro appears inside a server-side comment, discard all characters in the comment after the macro (that is, until the end of the comment rather than the next delimiter).
This is a minimal fix to allow only simple cases used by the mysqlbinlog utility. Limitations that are worth documenting:
  
- Nested server-side and/or client-side comments are not supported by mysql.cc
- Using client-side macros in multi-line server-side comments is not supported
- All characters after a client-side macro in a server-side comment will be omitted from the query string (and thus, will not be sent to server).
 2007-08-30 12:53:24 +04:00
msvensson@pilot.(none)
3df9790e41 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-28 16:47:41 +02:00
msvensson@pilot.(none)
4a7087526f Streamline "do_close_connection" and "do_send_quit" 
Fix typo, "next_con" -> "con"
 2007-08-28 16:47:05 +02:00
msvensson@pilot.(none)
221dba148e Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-28 15:33:14 +02:00
msvensson@pilot.(none)
4a013e295d Move "analyze_testcase_failure" to mysqltest(since it knows best when 
to perform this analyzis)
 2007-08-28 15:32:13 +02:00
msvensson@pilot.(none)
ccfbae831f Fix warning 2007-08-28 11:39:29 +02:00
tsmith@ramayana.hindu.god
c87236ce91 Merge ramayana.hindu.god:/home/tsmith/m/bk/51 
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
 2007-08-27 18:20:54 -06:00
baker@bk-internal.mysql.com
25c467bf6f Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-08-27 20:20:08 +02:00
msvensson@pilot.(none)
bc49f3b652 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-27 11:32:34 +02:00
msvensson@pilot.(none)
f9c245611e Bug#29805 mysql_upgrade test fail if ~/.my.cnf contain a password 
- "mysql" and "mysqlcheck" should not read defaults file
 2007-08-27 11:31:49 +02:00
msvensson@pilot.(none)
0b27b3bc0e Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-27 10:50:44 +02:00
msvensson@pilot.(none)
a91bd85215 Bug#28560 mysql_upgrade test links /usr/local/mysql/lib libraries 
- Chop off .libs/ part of path if running in non installed builddir
   using libtool
 2007-08-27 10:25:34 +02:00
jani@hynda.mysql.fi
6519de0469 Merge hynda.mysql.fi:/home/my/mysql-5.1-main 
into  hynda.mysql.fi:/home/my/mysql-5.1-marvel
 2007-08-22 17:29:38 +03:00
brian@piggy.tangent.org
e00b72de19 Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch 
into  piggy.tangent.org:/home/mysql/trees/mysql-5.1-arch
 2007-08-20 13:18:40 -07:00
brian@piggy.tangent.org
bd0bcb70f5 Extending tests for detach (found a memory issue in it, this fixes that and now tests it). 2007-08-20 13:03:50 -07:00
msvensson@pilot.(none)
d2fdcd908a Merge pilot.(none):/data/msvensson/mysql/work/my51-work 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-20 13:47:31 +02:00
kostja@bodhi.(none)
91fe15bb9d Fix doxygen warnings. 2007-08-15 17:43:08 +04:00
monty@mysql.com/narttu.mysql.fi
5d1c2dc913 Fixed problem that Start_log_event_v3::created was not set properly 
(This is becasue 'when' is not anymore set in constructor)
 2007-08-14 15:20:05 +03:00
monty@narttu.mysql.fi
9d609a59fd Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-08-14 00:22:34 +03:00
msvensson@pilot.(none)
40bcf44eff Merge pilot.(none):/data/msvensson/mysql/work/my50-work 
into  pilot.(none):/data/msvensson/mysql/work/my51-work
 2007-08-13 15:48:26 +02:00
msvensson@pilot.(none)
51580c6405 Improve error messages 
Write test results to var/log
Add test for "source" and variable expansion
 2007-08-13 15:46:11 +02:00
monty@mysql.com/nosik.monty.fi
e53a73e26c Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris 
Faster thr_alarm()
Added 'Opened_files' status variable to track calls to my_open()
Don't give warnings when running mysql_install_db
Added option --source-install to mysql_install_db

I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
index_read()      -> index_read_map()
index_read_idx()  -> index_read_idx_map()
index_read_last() -> index_read_last_map()
 2007-08-13 16:11:25 +03:00
msvensson@pilot.(none)
02419588a4 Merge bk-internal:/home/bk/mysql-5.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-13 11:35:10 +02:00
msvensson@pilot.(none)
cee0fe85ac Merge bk-internal:/home/bk/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-13 11:29:58 +02:00
baker@bk-internal.mysql.com
bc6e5b08dd Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
 2007-08-09 22:12:13 +02:00
brian@piggy.tangent.org
ae2b243a2e Two bugs in one! The count call was duplicating internally the counts for loaded tests (not autosql tests, just loaded). This could manifest itself by executing by file, or by executing a pre statement. 
BUG#29803
 2007-08-09 13:01:29 -07:00
msvensson@pilot.(none)
55c448bc1b Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-08 18:09:21 +02:00
msvensson@pilot.(none)
179cd4e016 Merge 192.168.0.7:mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-08 18:03:56 +02:00
msvensson@shellback.(none)
6d2f738ff9 Don't require a space between "if" and "(". This should 
also fix "while" and "connect"
It's now possible to write "if("
 2007-08-08 18:03:44 +02:00
msvensson@pilot.(none)
24666e55cf Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-08 16:49:15 +02:00
msvensson@pilot.(none)
a2f59d74f4 Merge 192.168.0.7:mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-08-08 16:47:35 +02:00
msvensson@shellback.(none)
792ac3fdcd Use "create_temp_file" to create a temporary file name for the perl script 2007-08-08 16:45:18 +02:00
msvensson@shellback.(none)
87f81bce4e Remove extra newline added to files created by write_file and append_file 2007-08-08 16:44:01 +02:00
msvensson@pilot.(none)
5e4b4ca6ab Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-08 10:05:09 +02:00
kostja@bodhi.(none)
28f1f1828d Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.(none):/opt/local/work/mysql-5.1-runtime
 2007-08-08 11:36:55 +04:00
msvensson@pilot.(none)
8d8123341b Fix warning 2007-08-08 09:31:45 +02:00
msvensson@pilot.(none)
a7ba7109c7 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-08-07 12:15:19 +02:00