summaryrefslogtreecommitdiff
path: root/sql/sql_lex.cc
diff options
context:
space:
mode:
authorGleb Shchepa <gshchepa@mysql.com>2008-10-07 21:30:36 +0500
committerGleb Shchepa <gshchepa@mysql.com>2008-10-07 21:30:36 +0500
commit5898c53c549aa794b14a3769a21878b50729de1f (patch)
treea569a275e896e5e6d846074ed2478b7c9fc4ca40 /sql/sql_lex.cc
parentb4c5cafeb01adb9f8303520342ff0621d41cf8f8 (diff)
parent1ce81aac15f0e7a89aef78f8e25ec7976f37972c (diff)
downloadmariadb-git-5898c53c549aa794b14a3769a21878b50729de1f.tar.gz
manual merge 5.0-5.1.29-rc --> 5.1-5.1.29-rc
Diffstat (limited to 'sql/sql_lex.cc')
0 files changed, 0 insertions, 0 deletions